diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 751bde6c1..db0aba95f 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -235,6 +235,7 @@
                       v-else-if="n.itemType === 'cascader'"
                       v-model.trim="form[n.columnName]"
                       :options="n.options"
+                      :props="{ checkStrictly: true }"
                       :disabled="disabled"
                       :props="{ emitPath: false }"
                       clearable
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 03b19b0de..18ba594ac 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -131,50 +131,15 @@
                        class="diy-button--reset"
                        @click="resetSearch">重置</el-button>
           </div>
-        </el-form>
-      </div>
-      <div class=div_left_table>
-        <build-table v-if="selTreeObj.level==='neighborHood'&&!showRoomTable"
-                     ref="ref_neighTable"
-                     :staffAgencyId="staffAgencyId"
-                     :showImportBtn="showImportBtn"
-                     :ownerName="ownerName"
-                     :ownerPhone="ownerPhone"
-                     :rentFlag="rentFlag"
-                     :purpose="purpose"
-                     :remark="remark"
-                     :updateStartDate="updateStartDate"
-                     :updateEndDate="updateEndDate"
-                     @toNextLevel="toNextLevel"
-                     @refreshTree="refreshTree"></build-table>
-
-        <room-table v-if="showRoomTable||selTreeObj.level==='building'"
-                    :staffAgencyId="staffAgencyId"
-                    :showImportBtn="showImportBtn"
-                    :ownerName="ownerName"
-                    :ownerPhone="ownerPhone"
-                    :rentFlag="rentFlag"
-                    :purpose="purpose"
-                    :remark="remark"
-                    :updateStartDate="updateStartDate"
-                    :updateEndDate="updateEndDate"
-                    ref="ref_buildingTable"
-                    @refreshTree="refreshTree"></room-table>
-
-        <community-table v-if="selTreeObj.level!=='building'&&selTreeObj.level!=='neighborHood'&&!showRoomTable"
-                         @toNextLevel="toNextLevel"
-                         :staffAgencyId="staffAgencyId"
-                         :ownerName="ownerName"
-                         :ownerPhone="ownerPhone"
-                         :rentFlag="rentFlag"
-                         :purpose="purpose"
-                         :remark="remark"
-                         :updateStartDate="updateStartDate"
-                         :updateEndDate="updateEndDate"
-                         ref="ref_communityTable"
-                         @refreshTree="refreshTree"></community-table>
-      </div>
-    </div>
+        </div>
+        <div class="resi-cell">
+          <div class="resi-cell-label">房主手机</div>
+          <div class="resi-cell-value">
+            <el-input v-model="ownerPhone"
+                      size="small"
+                      clearable
+                      placeholder="请输入内容">
+            </el-input>
 
   </div>
 </template>
@@ -543,7 +508,6 @@ export default {
 }
 </script>
 
-
 <style>
 /* .aui-content > .el-tabs > .el-tabs__content {
     padding: 0px;
@@ -564,47 +528,6 @@ export default {
 
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/visual/communityManage.scss";
-@import "@/assets/scss/modules/management/list-main.scss";
-</style>
-
-<style lang="scss" scoped >
-.div_main {
-  display: flex;
-}
-.scrollar {
-  margin-top: 10px;
-}
-
-.div_tree {
-  flex: 0 0 280px;
-  background-color: #ffffff;
-  border-radius: 5px;
-  padding: 10px;
-  overflow-y: hidden;
-}
-.filter_tree {
-  overflow-x: auto;
-}
-
-// .div_table {
-//   margin-left: 15px;
-//   // flex: 1;
-//   width: calc(100% - 300px);
-//   background-color: #ffffff;
-//   border-radius: 5px;
-//   padding: 10px;
-// }
-.div_left {
-  // flex: 1;
-  width: calc(100% - 300px);
-}
-.div_left_table {
-  margin-top: 10px;
-  margin-left: 15px;
-  background-color: #ffffff;
-  border-radius: 5px;
-  padding: 10px;
-}
 </style>
 
 
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 2433e227f..f0ef7e579 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -402,7 +402,7 @@ export default {
         ],
         remark: [
           { required: false }
-        ],
+        ]
       }
     },
 
diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue
index cf791d50b..6a07e6f1e 100644
--- a/src/views/modules/plugins/change/resideath.vue
+++ b/src/views/modules/plugins/change/resideath.vue
@@ -86,7 +86,7 @@
               <el-button @click="joinBlacklist(scope.row)"
                        type="text"
                        size="small"
-                       class="div-table-button--detail">迁入死亡人口</el-button>
+                       class="div-table-button--detail">新增死亡人口</el-button>
             <!-- <el-button @click="handleLook(scope.row)"
                        type="text"
                        size="small"
@@ -261,8 +261,8 @@
                  :userId="lookInfo.userId"
                  :gridName="lookInfo.gridName"
                  @close="handleCancleLook" />
-    <el-dialog title="迁入死亡人口的原因" :visible.sync="blacklistVisible" width="40%">
-      <textarea v-model="blacklistReason" placeholder="请输入迁入死亡人口的原因" class="blacklist-reason"></textarea>
+    <el-dialog title="新增死亡人口的原因" :visible.sync="blacklistVisible" width="40%">
+      <textarea v-model="blacklistReason" placeholder="请输入新增死亡人口的原因" class="blacklist-reason"></textarea>
       <div>
         <br/>
       </div>
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index 58206f455..ebebad7ae 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -40,39 +40,38 @@
 </template>
 
 <script>
-import 'ol/ol.css'
-import { Map, View } from 'ol'
-import TileLayer from 'ol/layer/Tile.js';
-import XYZ from 'ol/source/XYZ.js';
-import VectorLayer from 'ol/layer/Vector.js';
-import VectorSource from 'ol/source/Vector.js';
-import GeoJSON from 'ol/format/GeoJSON.js';
+import "ol/ol.css";
+import { Map, View } from "ol";
+import TileLayer from "ol/layer/Tile.js";
+import XYZ from "ol/source/XYZ.js";
+import VectorLayer from "ol/layer/Vector.js";
+import VectorSource from "ol/source/Vector.js";
+import GeoJSON from "ol/format/GeoJSON.js";
 import Point from "ol/geom/Point.js";
 import Feature from "ol/Feature.js";
-import Overlay from 'ol/Overlay';
-import { Select, DoubleClickZoom } from 'ol/interaction.js';
-import { getCenter, boundingExtent } from 'ol/extent.js';
-import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js';
-import { altKeyOnly, click, pointerMove } from 'ol/events/condition';
-import { getDistance } from 'ol/sphere';
-
-import MousePosition from 'ol/control/MousePosition';
-import { createStringXY } from 'ol/coordinate';
-import { defaults as defaultControls } from 'ol/control';
+import Overlay from "ol/Overlay";
+import { Select, DoubleClickZoom } from "ol/interaction.js";
+import { getCenter, boundingExtent } from "ol/extent.js";
+import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from "ol/style.js";
+import { altKeyOnly, click, pointerMove } from "ol/events/condition";
+import { getDistance } from "ol/sphere";
+
+import MousePosition from "ol/control/MousePosition";
+import { createStringXY } from "ol/coordinate";
+import { defaults as defaultControls } from "ol/control";
 import { mapGetters } from "vuex";
-import { Loading } from 'element-ui'; //引入Loading服务
+import { Loading } from "element-ui"; //引入Loading服务
 
 import { requestPost } from "@/js/dai/request";
-var centerPointGlobal = [120.38945519, 36.0722275]
+var centerPointGlobal = [120.38945519, 36.0722275];
 
-
-let loading;//加载动画
+let loading; //加载动画
 
 let map;
 let mapView;
-let gaodeMapLayer;//背景地图图层
-let polygonLayer;//区域多边形标注图层
-let polygonSource;//标注多边形
+let gaodeMapLayer; //背景地图图层
+let polygonLayer; //区域多边形标注图层
+let polygonSource; //标注多边形
 
 let polIconLayer; // 区域icon标注图层
 let polIconSource; // icon
@@ -80,16 +79,16 @@ let polIconSource; // icon
 let iconLayer; // icon图层
 let iconSource; // icon
 
-let select;//选中标注
+let select; //选中标注
 
 let iconTextsStyle = {
   textAlign: undefined,
   font: "18px Arial",
   //fontFamily: "Courier New, monospace",
   // fontWeight: "bold",
-  text: '',
+  text: "",
   backgroundFill: new Fill({
-    color: 'rgba(0, 146, 238, 0.75)'
+    color: "rgba(0, 146, 238, 0.75)",
     // color: textColorArray[feature.values_.colorIndex]
   }),
   padding: [4, 10, 4, 10],
@@ -99,64 +98,58 @@ let iconTextsStyle = {
   offsetY: -30,
   offsetX: -50,
   overflow: true,
-}
+};
 
 let polygonColorArray = [
-  'rgba(210, 2, 2, 0.24)',
-  'rgba(43, 231, 253, 0.25)',
-  'rgba(183, 185, 0, 0.16)'
+  "rgba(210, 2, 2, 0.24)",
+  "rgba(43, 231, 253, 0.25)",
+  "rgba(183, 185, 0, 0.16)",
 ];
 
 //icon文字样式
 let createTextStyle = function (feature) {
-
   if (iconTextsStyle) {
-    let iconTextsStyles = { ...iconTextsStyle }
-    iconTextsStyles.text = feature.values_ && feature.values_.name || feature.name
-    return new Text({ ...iconTextsStyles })
+    let iconTextsStyles = { ...iconTextsStyle };
+    iconTextsStyles.text = (feature.values_ && feature.values_.name) || feature.name;
+    return new Text({ ...iconTextsStyles });
   } else {
-    return null
+    return null;
   }
-
-
-}
+};
 //多边形标注样式
 var polygonStyleFunction = (function () {
   return function (feature) {
     return new Style({
       fill: new Fill({
         // color: [255, 255, 255, 0.3]
-        color: feature.values_.fillColor
+        color: feature.values_.fillColor,
       }),
       stroke: new Stroke({
         color: feature.values_.color,
-        width: 2
+        width: 2,
       }),
 
       // text: createTextStyle(feature)
-    });;
+    });
   };
-})()
-
-
+})();
 
 const vueGis = {
-  name: 'HomeMap',
-  data () {
+  name: "HomeMap",
+  data() {
     return {
-      centerPoint: [],//中心点位置
-      zoom: 14,//缩放范围：区14
-      minZoom: 1,//最小缩放
+      centerPoint: [], //中心点位置
+      zoom: 14, //缩放范围：区14
+      minZoom: 1, //最小缩放
       overlay: null,
       showPopup: false,
-      mapInfo: {
-
-      },
+      mapInfo: {},
 
       polygonArray: [
         {
           agencyLevel: "grid",
-          coordinates: "120.37421528296863,36.085017737014525,120.37551227771064,36.08181339174796,120.38108173804676,36.08303409283569,120.3852397566111,36.08318668276358,120.38539234391965,36.090816077003794,120.37410084117755,36.09096866431234,120.37421528296863,36.085017737014525",
+          coordinates:
+            "120.37421528296863,36.085017737014525,120.37551227771064,36.08181339174796,120.38108173804676,36.08303409283569,120.3852397566111,36.08318668276358,120.38539234391965,36.090816077003794,120.37410084117755,36.09096866431234,120.37421528296863,36.085017737014525",
           id: "2a278c0ceb863359d263fda7aabf6752",
           latitude: 36.072227,
           level: "grid",
@@ -165,7 +158,8 @@ const vueGis = {
         },
         {
           agencyLevel: "grid",
-          coordinates: "120.38577111171519,36.095762169637716,120.38544318588274,36.08317796726519,120.39339541546589,36.08080049372144,120.40122467708379,36.08026761565102,120.40188052874869,36.08276805856732,120.39929810296697,36.086990119140545,120.39757648953199,36.08981849070392,120.39901116927089,36.0943274884915,120.3977404524482,36.096418022709926,120.38577111171519,36.095762169637716",
+          coordinates:
+            "120.38577111171519,36.095762169637716,120.38544318588274,36.08317796726519,120.39339541546589,36.08080049372144,120.40122467708379,36.08026761565102,120.40188052874869,36.08276805856732,120.39929810296697,36.086990119140545,120.39757648953199,36.08981849070392,120.39901116927089,36.0943274884915,120.3977404524482,36.096418022709926,120.38577111171519,36.095762169637716",
           id: "94227891bc4ad5f40cb95081761592d9",
           latitude: 36.072227,
           level: "grid",
@@ -174,7 +168,8 @@ const vueGis = {
         },
         {
           agencyLevel: "grid",
-          coordinates: "120.3736430792519,36.09505039184175,120.373948253869,36.09119754789451,120.38543049205646,36.09115940106737,120.38577381481036,36.0960803587938,120.3736430792519,36.09505039184175",
+          coordinates:
+            "120.3736430792519,36.09505039184175,120.373948253869,36.09119754789451,120.38543049205646,36.09115940106737,120.38577381481036,36.0960803587938,120.3736430792519,36.09505039184175",
           id: "a772a325e022484ef53e4a7d679726f1",
           latitude: 36.072227,
           level: "grid",
@@ -183,184 +178,182 @@ const vueGis = {
         },
       ],
 
-      iconArrays: [
-
-      ],
+      iconArrays: [],
       // iconTextStyle: {},
 
       //policon图标样式
       polIconUrlArray: [
-        'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
-        'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
-        'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
+        "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png",
+        "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png",
+        "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png",
       ],
       //icon图标样式
       iconUrlArray: [],
-      iconTextColor: '#ffffff',
-      distanceMax: null,//显示的坐标距离中心点的范围                                                    
+      iconTextColor: "#ffffff",
+      distanceMax: null, //显示的坐标距离中心点的范围
 
       input_lat: null,
       input_lon: null,
 
-      isChangeCenter: true,//是否根据多边形改变数组
-    }
-  },
-  async mounted () {
-
+      isChangeCenter: true, //是否根据多边形改变数组
+    };
   },
+  async mounted() {},
   methods: {
-    showPosition () {
-      let array = [this.input_lat, this.input_lon]
-      map.getView().setCenter(array)
+    showPosition() {
+      let array = [this.input_lat, this.input_lon];
+      map.getView().setCenter(array);
     },
     //加载地图:地图基本信息，多边形区域信息，多边形icon
-    loadMap (mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray, iconTextStyle, distanceMax) {
-      this.mapInfo = mapInfo
-      this.polygonArray = polygonArray
-      this.polIconUrlArray = polIconUrlArray || []
-      this.iconArrays = iconArrays
-      this.iconUrlArray = iconUrlArray
-      iconTextsStyle = iconTextStyle || iconTextsStyle
-      this.distanceMax = distanceMax
+    loadMap(
+      mapInfo,
+      polygonArray,
+      polIconUrlArray,
+      iconArrays,
+      iconUrlArray,
+      iconTextStyle,
+      distanceMax
+    ) {
+      this.mapInfo = mapInfo;
+      this.polygonArray = polygonArray;
+      this.polIconUrlArray = polIconUrlArray || [];
+      this.iconArrays = iconArrays;
+      this.iconUrlArray = iconUrlArray;
+      iconTextsStyle = iconTextStyle || iconTextsStyle;
+      this.distanceMax = distanceMax;
 
       // iconArrays.forEach(item => {
       //   console.log(item.type, item.urlIndex, item.latitude, item.longitude)
       // });
 
-
       //初始化地图
       this.initMap()
       if (this.showPolIconLayer) {
-        console.log('showPolIconLayer++++++++++++++++++++++', this.showPolIconLayer)
+        console.log("showPolIconLayer++++++++++++++++++++++", this.showPolIconLayer);
         //初始化多边形标注图层
-        this.initPolIconLayer()
+        this.initPolIconLayer();
         //加载当前园区的标注
         // this.loadPolIcon()
       }
       if (this.showPolygonLayer) {
         //初始化多边形标注图层
-        this.initPolygonLayer()
+        this.initPolygonLayer();
         //加载当前园区的标注
-        this.loadPolygon()
+        this.loadPolygon();
       }
 
-
       if (this.showIconLayer) {
         //初始化icon图层
-        this.initIconLayer()
-        this.loadIcon()
+        this.initIconLayer();
+        this.loadIcon();
       }
 
       if (this.isAddOpenlay) {
         //初始化icon图层
-        this.addOverlay()
+        this.addOverlay();
       }
 
-      this.addMapClick()
-
+      this.addMapClick();
     },
 
     //刷新地图:地图信息，多边形数组，标注数组，是否根据多边形改变中心点
-    async refreshMap (mapInfo, polygonArray, iconArrays, isChangeCenter) {
-      this.mapInfo = mapInfo
-      this.polygonArray = []
-      this.polygonArray = polygonArray
-      this.iconArrays = iconArrays
-      this.isChangeCenter = isChangeCenter
+    async refreshMap(mapInfo, polygonArray, iconArrays, isChangeCenter) {
+      this.mapInfo = mapInfo;
+      this.polygonArray = [];
+      this.polygonArray = polygonArray;
+      this.iconArrays = iconArrays;
+      this.isChangeCenter = isChangeCenter;
       if (iconSource) {
-        iconSource.clear()
+        iconSource.clear();
       }
       if (polygonSource) {
-        polygonSource.clear()
+        polygonSource.clear();
       }
       if (polIconSource) {
-        polIconSource.clear()
+        polIconSource.clear();
       }
-      this.initPolIconLayer()
+      this.initPolIconLayer();
 
       if (this.showPolygonLayer) {
-        this.initPolygonLayer()
+        this.initPolygonLayer();
         //加载当前园区的标注
-        this.loadPolygon()
+        this.loadPolygon();
       }
       if (this.showPolIconLayer) {
-        this.initIconLayer()
+        this.initIconLayer();
         //加载当前园区的标注
         // this.loadPolIcon()
       }
 
       if (this.showIconLayer) {
-
-        this.loadIcon()
+        this.loadIcon();
       }
-      this.setMapLocation()
+      this.setMapLocation();
       // gaodeMapLayer.getSource().changed()
     },
 
     //加载区域多边形
-    loadPolygon () {
-      polygonSource.clear()//清空多边形标注
+    loadPolygon() {
+      polygonSource.clear(); //清空多边形标注
       // iconSource.clear()
-      let featureData = []//多边形数据数据
-
-      if (this.polygonArray && this.polygonArray.length > 0) {//判断是否存在下级标注
-        let oneData = {}
+      let featureData = []; //多边形数据数据
 
-        this.polygonArray.forEach(polygonItem => {
+      if (this.polygonArray && this.polygonArray.length > 0) {
+        //判断是否存在下级标注
+        let oneData = {};
 
-          if (polygonItem.coordinates && polygonItem.coordinates !== '') {//如果有坐标
+        this.polygonArray.forEach((polygonItem) => {
+          if (polygonItem.coordinates && polygonItem.coordinates !== "") {
+            //如果有坐标
 
             oneData = {
-              type: 'Feature',
+              type: "Feature",
 
               properties: { ...polygonItem },
               geometry: {
-                type: 'Polygon',
+                type: "Polygon",
                 coordinates: [],
               },
-            }
-            let coorArray = polygonItem.coordinates.split(',')//坐标数组
+            };
+            let coorArray = polygonItem.coordinates.split(","); //坐标数组
 
-            let itemArray = []//单个点位的[lon,lat]，数组
-            let tempPolygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+            let itemArray = []; //单个点位的[lon,lat]，数组
+            let tempPolygonArray = []; //整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
 
             coorArray.forEach((item, index) => {
-              itemArray.push(item)
-              if (index % 2 == 0) {//偶
-
-              } else {//奇
-                tempPolygonArray.push(itemArray)
-                itemArray = []
+              itemArray.push(item);
+              if (index % 2 == 0) {
+                //偶
+              } else {
+                //奇
+                tempPolygonArray.push(itemArray);
+                itemArray = [];
               }
-
             });
-            oneData.geometry.coordinates.push(tempPolygonArray)
-            featureData.push(oneData)
+            oneData.geometry.coordinates.push(tempPolygonArray);
+            featureData.push(oneData);
           }
         });
       }
 
       if (featureData && featureData.length > 0) {
         var geojsonObject = {
-          'type': 'FeatureCollection',
-          'features': featureData
+          type: "FeatureCollection",
+          features: featureData,
         };
-        let feature = (new GeoJSON()).readFeatures(geojsonObject)
+        let feature = new GeoJSON().readFeatures(geojsonObject);
 
-        polygonSource.addFeatures(feature)
+        polygonSource.addFeatures(feature);
 
         if (this.showPolIconLayer) {
-          this.loadPolIcon(feature)
+          this.loadPolIcon(feature);
         }
-
-
       }
-
     },
 
     //加载区域多边形的icon
-    loadPolIcon (feature) {
-      polIconSource.clear()
+    loadPolIcon(feature) {
+      polIconSource.clear();
       let polyIconFeatures = [];
       // console.log('feature-----', feature)
       feature.forEach(oneIcon => {
@@ -368,16 +361,16 @@ const vueGis = {
         var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
         // var center = getCenter(extent);   //获取边界区域的中心位置
         //添加标注
-        let x = (parseFloat(extent[0]) + parseFloat(extent[2])) / 2
-        let y = (parseFloat(extent[1]) + parseFloat(extent[3])) / 2
+        let x = (parseFloat(extent[0]) + parseFloat(extent[2])) / 2;
+        let y = (parseFloat(extent[1]) + parseFloat(extent[3])) / 2;
 
         let polyIcon = new Feature({
           geometry: new Point([x, y]),
           id: oneIcon.id_,
           properties: {
             type: "icon",
-            id: oneIcon.id_
-          }
+            id: oneIcon.id_,
+          },
         });
         // console.log('oneIcon----ddd', oneIcon)
         let polyIconStyle = new Style({
@@ -385,23 +378,21 @@ const vueGis = {
             // anchor: [0.5, 0.5],
             // imgSize: [32, 32],
             scale: this.areaScale,
-            src: this.polIconUrlArray[0]
+            src: this.polIconUrlArray[0],
           }),
-          text: createTextStyle(oneIcon)
+          text: createTextStyle(oneIcon),
         });
 
         polyIcon.setStyle(polyIconStyle);
         polyIconFeatures.push(polyIcon);
-
       });
       polIconSource.addFeatures(polyIconFeatures);
     },
 
     //加载icon图标
-    loadIcon () {
-      iconSource.clear()//清空多边形标注
+    loadIcon() {
+      iconSource.clear(); //清空多边形标注
       if (this.iconArrays && this.iconArrays.length > 0) {
-
         let iconFeatures = [];
 
         this.iconArrays.forEach((oneIcon, index) => {
@@ -412,8 +403,8 @@ const vueGis = {
             id: oneIcon.id,
             properties: {
               type: "icon",
-              info: { ...oneIcon }
-            }
+              info: { ...oneIcon },
+            },
           });
           // console.log('oneIcon----', this.iconUrlArray[oneIcon.urlIndex])
           let iconStyle = new Style({
@@ -430,88 +421,85 @@ const vueGis = {
           iconItem.setStyle(iconStyle);
 
           if (this.distanceMax) {
-            if (this.computedDistance(oneIcon.longitude, oneIcon.latitude, this.distanceMax)) {
+            if (
+              this.computedDistance(oneIcon.longitude, oneIcon.latitude, this.distanceMax)
+            ) {
               iconFeatures.push(iconItem);
             }
           } else {
             iconFeatures.push(iconItem);
           }
-
-
-
-
         });
 
         iconSource.addFeatures(iconFeatures);
       }
     },
 
-
     //计算和中心点距离
-    computedDistance (lon, lat, max) {
-      let c1 = [2]; c1[0] = lon; c1[1] = lat;
+    computedDistance(lon, lat, max) {
+      let c1 = [2];
+      c1[0] = lon;
+      c1[1] = lat;
       let distance = getDistance(this.centerPoint, c1);
       // console.log(distance)
-      return (distance < max || distance === max)
+      return distance < max || distance === max;
 
       // debugger
-      //   return 
-      // var wgs84Sphere = new ol.Sphere(6378137); 
+      //   return
+      // var wgs84Sphere = new ol.Sphere(6378137);
       // wgs84Sphere.haversineDistance([120.21592590991689, 30.210793016606],[120.21670777384473, 30.211168525868086]);
     },
 
     //初始化地图
-    initMap () {
-      this.firstCentermap()
+    initMap() {
+      this.firstCentermap();
       gaodeMapLayer = new TileLayer({
         title: "地图",
         source: new XYZ({
           //指定url瓦片
-          url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
-          wrapX: true//x方向平铺，也可以选择false
+          url:
+            "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}",
+          wrapX: true, //x方向平铺，也可以选择false
         }),
-        zIndex: 20
+        zIndex: 20,
       });
 
       mapView = new View({
         //中心点坐标
         center: this.centerPoint,
         // projection: 'EPSG:3857',
-        projection: 'EPSG:4326',
+        projection: "EPSG:4326",
         zoom: this.zoom,
-        minZoom: this.minZoom
-      })
+        minZoom: this.minZoom,
+      });
 
       //初始化map和地图底图
       //创建地图容器
       map = new Map({
-
         layers: [gaodeMapLayer],
         //加载瓦片图层数据
         view: mapView,
-        target: this.mapId
+        target: this.mapId,
         //目标加载到map中
-      })
+      });
 
       var mousePositionControl = new MousePosition({
-        coordinateFormat: createStringXY(6),//获取位置
-        projection: 'EPSG:4326',
-        className: 'custom-mouse-position',
-        target: document.getElementById('mouse-position'), //将位置数据放到那里
-        undefinedHTML: '&nbsp'
+        coordinateFormat: createStringXY(6), //获取位置
+        projection: "EPSG:4326",
+        className: "custom-mouse-position",
+        target: document.getElementById("mouse-position"), //将位置数据放到那里
+        undefinedHTML: "&nbsp",
       });
       map.addControl(mousePositionControl);
 
-
       //去除双击放大效果
       const dblClickInteraction = map
         .getInteractions()
         .getArray()
-        .find(interaction => {
+        .find((interaction) => {
           return interaction instanceof DoubleClickZoom;
         });
       map.removeInteraction(dblClickInteraction);
-
     },
     //设置地图定位的中心点和缩放级别
     setMapLocation () {
@@ -557,157 +545,146 @@ const vueGis = {
       }
 
       if (!this.isChangeCenter) {
-        return false
+        return false;
       }
       // debugger
       if (!this.zoom) {
-        this.setZoom(this.mapInfo.agencyLevel)
+        this.setZoom(this.mapInfo.agencyLevel);
       }
-      this.centerPoint = []
+      this.centerPoint = [];
 
       //如果存在中心点（返回时赋值）
       if (this.center && this.center.length > 0) {
-        this.centerPoint = this.center
-        this.centerFlag = 'point'
-        this.center = []
-
-      } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
-        this.centerFlag = 'flag_polygon'
-        this.centerPoint.push(this.mapInfo.longitude)
-        this.centerPoint.push(this.mapInfo.latitude)
-
+        this.centerPoint = this.center;
+        this.centerFlag = "point";
+        this.center = [];
+      } else if (polygonLayer.getSource().getFeatures()[0]) {
+        //如果是初次进入,存在下级组织
+        this.centerFlag = "flag_polygon";
       } else if (this.mapInfo.longitude && this.mapInfo.latitude) {
-        this.centerPoint.push(this.mapInfo.longitude)
-        this.centerPoint.push(this.mapInfo.latitude)
-        this.centerFlag = 'point'
-
+        this.centerPoint.push(this.mapInfo.longitude);
+        this.centerPoint.push(this.mapInfo.latitude);
+        this.centerFlag = "point";
       } else {
-        this.centerPoint = centerPointGlobal
-        this.centerFlag = 'point'
+        this.centerPoint = centerPointGlobal;
+        this.centerFlag = "point";
       }
-
       // debugger
-      if (this.centerFlag === 'flag_parent') {
-        let parentFeatures = parentLayer.getSource().getFeatures()[0]
+      if (this.centerFlag === "flag_parent") {
+        let parentFeatures = parentLayer.getSource().getFeatures()[0];
         let polygon = parentFeatures.getGeometry();
         map.getView().fit(polygon, map.getSize());
-        this.zoom = map.getView().getZoom() - 1
-
-      } else if (this.centerFlag === 'flag_polygon') {
-        let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
+        this.zoom = map.getView().getZoom() - 1;
+      } else if (this.centerFlag === "flag_polygon") {
+        let polygonFeatures = polygonLayer.getSource().getFeatures()[0];
         let polygon = polygonFeatures.getGeometry();
         map.getView().fit(polygon, map.getSize());
-        this.zoom = map.getView().getZoom() - 1
-
+        this.zoom = map.getView().getZoom() - 1;
       } else {
         mapView.setCenter(this.centerPoint);
-
       }
       mapView.setZoom(this.zoom);
-
     },
     firstCentermap () {
       if (this.mapInfo.longitude && this.mapInfo.latitude) {
-        this.centerPoint = []
-        this.centerPoint.push(this.mapInfo.longitude)
-        this.centerPoint.push(this.mapInfo.latitude)
+        this.centerPoint = [];
+        this.centerPoint.push(this.mapInfo.longitude);
+        this.centerPoint.push(this.mapInfo.latitude);
       } else {
-
-        this.centerPoint = centerPointGlobal
+        this.centerPoint = centerPointGlobal;
       }
 
-      this.setZoom(this.mapInfo.agencyLevel)
+      this.setZoom(this.mapInfo.agencyLevel);
     },
 
     //根据组织层级设置缩放级别
-    setZoom (level) {
-      if (level === 'district') {
-        this.zoom = 12
-      } else if (level === 'street') {
-        this.zoom = 13
-      } else if (level === 'community') {
-        this.zoom = 14
+    setZoom(level) {
+      if (level === "district") {
+        this.zoom = 11;
+      } else if (level === "street") {
+        this.zoom = 12;
+      } else if (level === "community") {
+        this.zoom = 13;
       }
-
     },
 
     //初始化多边形标注图层
-    initPolygonLayer () {
+    initPolygonLayer() {
       polygonSource = new VectorSource({
         // features: (new GeoJSON()).readFeatures(geojsonObject)
-        wrapX: false
+        wrapX: false,
       });
 
       polygonLayer = new VectorLayer({
         source: polygonSource,
         style: polygonStyleFunction,
-        zIndex: 50
+        zIndex: 50,
       });
-      let that = this
+      let that = this;
       //选中多边形后的样式
       var overlayStyle = (function () {
-
         return function (feature) {
           var styles = {};
-          styles['Polygon'] = [
+          styles["Polygon"] = [
             new Style({
               stroke: new Stroke({
-                color: '#ec9000',
-                width: 2
-              })
+                color: "#ec9000",
+                width: 2,
+              }),
             }),
 
             new Style({
               fill: new Fill({
-                color: 'rgba(0, 0, 255, 0.1)'
-              })
+                color: "rgba(0, 0, 255, 0.1)",
+              }),
             }),
             new Style({
               // text: createTextStyle(feature) // 报错 暂时注掉 zhaotongyao 2022.05.19
-            })
+            }),
           ];
-          styles['MultiPolygon'] = styles['Polygon'];
+          styles["MultiPolygon"] = styles["Polygon"];
           return styles[feature.getGeometry().getType()];
         };
       })();
 
-      // select = new Select({
-      //   style: overlayStyle
-      // });
-      // 有BUG 加入多边形选中样式时，如果同时存在icon层和多边形层，点击icon会使icon消失 ---zhaotongyao 2022.06.01
-
-      map.addLayer(polygonLayer)
-      // map.addInteraction(select);
+      select = new Select({
+        style: overlayStyle
+      });
 
 
+      map.addLayer(polygonLayer)
+      if (this.$route.path == '/main-shuju/visual-communityParty-gridParty' || this.$route.path == '/main-shuju/visual-communityParty-community') { // 2022.6.9 网格党建平面图 联建单位分析页面 点位点击以后会消失，屏蔽这段代码以后可以解决
+         console.log('去掉默认点击')
+      } else {
+          map.addInteraction(select);
+      }
     },
 
     //初始化多边形icon图层
-    initPolIconLayer () {
+    initPolIconLayer() {
       polIconSource = new VectorSource({
         //features: (new GeoJSON()).readFeatures(geojsonObject)
-        wrapX: false
+        wrapX: false,
       });
 
       polIconLayer = new VectorLayer({
         source: polIconSource,
-        zIndex: 70
+        zIndex: 70,
       });
 
       map.addLayer(polIconLayer);
-
     },
 
     //初始化icon图层
-    initIconLayer () {
+    initIconLayer() {
       iconSource = new VectorSource({
         //features: (new GeoJSON()).readFeatures(geojsonObject)
-        wrapX: false
+        wrapX: false,
       });
 
       iconLayer = new VectorLayer({
         source: iconSource,
-        zIndex: 90
+        zIndex: 90,
       });
 
       map.addLayer(iconLayer);
@@ -721,21 +698,23 @@ const vueGis = {
     },
 
     //添加覆盖层
-    addOverlay () {
+    addOverlay() {
       // 使用变量存储弹窗所需的 DOM 对象
       var container = document.getElementById("popup");
       var closer = document.getElementById("popup-closer");
       var content = document.getElementById("popup-content");
-      var goMore = document.getElementById("popup-goMore") ? document.getElementById("popup-goMore") : null
+      var goMore = document.getElementById("popup-goMore")
+        ? document.getElementById("popup-goMore")
+        : null;
 
       // 创建一个弹窗 Overlay 对象
       this.overlay = new Overlay({
         element: container, //绑定 Overlay 对象和 DOM 对象的
         autoPan: true, // 定义弹出窗口在边缘点击时候可能不完整 设置自动平移效果
         autoPanAnimation: {
-          duration: 250 //自动平移效果的动画时间 9毫秒
+          duration: 250, //自动平移效果的动画时间 9毫秒
         },
-        zIndex: 100
+        zIndex: 100,
       });
       // 将弹窗添加到 map 地图中
       map.addOverlay(this.overlay);
@@ -751,80 +730,70 @@ const vueGis = {
       };
       if (goMore) {
         goMore.onclick = function () {
-          _that.$emit('lookMore')
+          _that.$emit("lookMore");
         };
       }
     },
 
     //注册地图点击事件
-    addMapClick () {
-      let _that = this
-
+    addMapClick() {
+      let _that = this;
 
       map.on("click", function (evt) {
         const feature = map.forEachFeatureAtPixel(evt.pixel, function (feature) {
           return feature;
         });
         if (feature) {
-
           // console.log(feature)
-          if (_that.clickType === 'back') {
-
-            _that.$emit('clickFeature', feature)
-
-
-          } else if (_that.clickType === 'popup') {
-            _that.$emit('clickFeature', feature)
-
+          if (_that.clickType === "back") {
+            _that.$emit("clickFeature", feature);
+          } else if (_that.clickType === "popup") {
+            _that.$emit("clickFeature", feature);
           } else {
-            console.log('此处没有标注')
+            console.log("此处没有标注");
           }
-
         }
-
       });
     },
 
-    handleShowPopup (showData, coordinate, isShowMore) {
+    handleShowPopup(showData, coordinate, isShowMore) {
       if (isShowMore) {
-        document.getElementById("popup-goMore").style.display = 'block'
+        document.getElementById("popup-goMore").style.display = "block";
       } else {
-        document.getElementById("popup-goMore").style.display = 'none'
+        document.getElementById("popup-goMore").style.display = "none";
       }
-      console.log(this.overlay.getElement())
+      console.log(this.overlay.getElement());
       let content = document.getElementById("popup-content");
-      this.overlay.getElement().style.display = 'block'
-      this.overlay.getElement().parentNode.style.display = 'block'
-      this.overlay.getElement().parentNode.parentNode.style.display = 'block'
+      this.overlay.getElement().style.display = "block";
+      this.overlay.getElement().parentNode.style.display = "block";
+      this.overlay.getElement().parentNode.parentNode.style.display = "block";
       content.innerHTML = showData;
       this.overlay.setPosition(coordinate);
       //把 overlay 显示到指定的 x,y坐标
-
     },
     // 关闭弹窗
-    handleClosePopup () {
+    handleClosePopup() {
       this.overlay.setPosition(undefined);
       document.getElementById("popup-closer").blur();
       return false;
     },
 
     //取随机数
-    getRndBetween (lowerLimit, upperLimit) {
+    getRndBetween(lowerLimit, upperLimit) {
       return Math.floor(Math.random() * (upperLimit - lowerLimit + 1)) + lowerLimit;
     },
 
     //开启加载动画
-    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();
@@ -834,63 +803,55 @@ const vueGis = {
   props: {
     mapId: {
       type: String,
-      default: 'map'
+      default: "map",
     },
     //是否显示多边形图层
     showPolygonLayer: {
       type: Boolean,
-      default: false
+      default: false,
     },
     //是否显示多边形icon图层
     showPolIconLayer: {
       type: Boolean,
-      default: false
+      default: false,
     },
 
     //是否显示标注
     showIconLayer: {
       type: Boolean,
-      default: false
+      default: false,
     },
     //是否添加弹出框图层
     isAddOpenlay: {
       type: Boolean,
-      default: false
+      default: false,
     },
 
     //点击地图事件类型,back:返回，popup:弹出层
     clickType: {
       type: String,
-      default: 'back'
+      default: "back",
     },
     areaScale: {
       type: Number,
-      default: 0.5
-    }
-
+      default: 0.5,
+    },
   },
   computed: {
-
-    mapHeight () {
+    mapHeight() {
       return this.clientHeight - 120;
-
     },
 
-    ...mapGetters(["clientHeight"])
-
+    ...mapGetters(["clientHeight"]),
   },
   components: {},
-}
+};
 export default vueGis;
 </script>
 
-<style
-  lang="scss"
-  src="@/assets/scss/modules/visual/basicInfoMain.scss"
-  scoped
-></style>
+<style lang="scss" src="@/assets/scss/modules/visual/basicInfoMain.scss" scoped></style>
 
-<style lang="scss" >
+<style lang="scss">
 .div_content_map {
   .ol-viewport {
     border-radius: 5px;
@@ -958,4 +919,4 @@ export default vueGis;
   // color: rgba(1, 17, 104, 1);
   color: #fff;
 }
-</style>   
\ No newline at end of file
+</style>
diff --git a/src/views/modules/workSys/pointAditive/rule.vue b/src/views/modules/workSys/pointAditive/rule.vue
new file mode 100644
index 000000000..846438c9d
--- /dev/null
+++ b/src/views/modules/workSys/pointAditive/rule.vue
@@ -0,0 +1,515 @@
+<template>
+  <div v-if="pageLoading"
+       class="resi-container">
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+        <el-button class="diy-button--add"
+                   size="small"
+                   @click="handleAdd('1', 'add')">添加积分类别</el-button>
+      </div>
+
+      <el-table :data="tableData"
+                row-key="id"
+                v-loading="tableLoading"
+                :height="tableHeight"
+                style="width: 100%"
+                class="resi-table"
+                border>
+        <el-table-column v-for="item in tableHeader"
+                         :key="item.columnName"
+                         :prop="item.columnName"
+                         :label="item.label"
+                         :align="item.align">
+        </el-table-column>
+        <el-table-column label="操作"
+                         align="center"
+                         width="200">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.pid == 0"
+                       @click="handleAdd('2', 'add', scope.row.id)"
+                       type="text"
+                       size="small"
+                       class="btn-color-1j">添加二级分类</el-button>
+            <el-button v-if="scope.row.pid != 0 && scope.row.categoryName"
+                       @click="handleAdd('3', 'add', scope.row.id, scope.row.pid, scope.row.categoryName)"
+                       type="text"
+                       size="small"
+                       class="btn-color-2j">添加积分规则</el-button>
+            <el-button v-if="scope.row.pid != 0"
+                       @click="handleEdit(scope.row, 'edit', scope.row.categoryName ? '4' :  scope.row.ruleName ? '5' : '1')"
+                       type="text"
+                       size="small"
+                       class="btn-color-edit">修改</el-button>
+            <el-button v-if="scope.row.pid != 0"
+                       @click="handleDel(scope.row)"
+                       type="text"
+                       size="small"
+                       class="btn-color-del">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-dialog :title="addLevel == '1' ? '添加积分分类' : addLevel == '2' ? '添加二级分类' : addLevel == '3' ? '添加积分规则' : addLevel == '4' ? '修改二级分类' : addLevel == '5' ? '修改积分规则' : ''"
+               :visible.sync="dialogVisible"
+               width="40%"
+               append-to-body
+               :close-on-click-modal="false"
+               :before-close="handlerCancle">
+      <el-form label-width="100px"
+               :model="form"
+               :rules="rules"
+               ref="ruleForm">
+        <el-form-item label="上级分类"
+                      prop="pid">
+          <el-select class="item_width_1"
+                      v-model="form.pid"
+                      placeholder="请选择"
+                      size="small"
+                      :disabled="addLevel == '2' || addLevel == '3' || addLevel == '4' || addLevel == '5' ? true : false"
+                      clearable>
+            <el-option v-for="item in typeList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+        <el-form-item label="类别名称"
+                      prop="categoryName">
+          <el-input :disabled="addLevel == '3' || addLevel == '5' ? true : false" v-model="form.categoryName"
+                    size="small"
+                    style="width: 180px;"></el-input>
+        </el-form-item>
+        <el-form-item v-if="addLevel == '3'  || addLevel == '5'" label="规则名称"
+                      prop="ruleName">
+          <el-input v-model="form.ruleName"
+                    size="small"
+                    style="width: 180px;"></el-input>
+        </el-form-item>
+        <el-form-item v-if="addLevel == '3' || addLevel == '5'"
+                      label="加减分值"
+                      prop="pointValue">
+          <el-input-number v-model="form.pointValue"
+                           size="small"
+                           label="描述文字"></el-input-number>
+          (减分请输入负数)
+        </el-form-item>
+        <el-form-item v-if="addLevel == '3' || addLevel == '5'"
+                      label="居民端积分申请"
+                      prop="applyFlag"
+                      label-width="140px">
+            <el-radio v-model="form.applyFlag" label="0">允许申请</el-radio>
+            <el-radio v-model="form.applyFlag" label="1">不允许申请</el-radio>
+        </el-form-item>
+      </el-form>
+      <div class="resi-btns">
+        <el-button size="small"
+                   @click="handlerCancle">取消</el-button>
+        <el-button type="primary"
+                   size="small"
+                   :loading="btnLoading"
+                   @click="handleSUbmit">提交</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+export default {
+  data () {
+    return {
+      tableLoading: false,
+      btnLoading: false,
+      pageLoading: false,
+      dialogVisible: false,
+      tableData: [],
+      sHeight: 0,
+      addLevel: '1',
+      addType: 'add',
+      tableHeader: [
+        {
+          label: '积分类别',
+          align: 'left',
+          columnName: 'categoryName'
+        }, {
+          label: '积分规则',
+          columnName: 'ruleName',
+          align: 'center'
+        }
+      ],
+      typeList: [], //类别
+      form: { // 新增修改相关
+        categoryName: '', // 类别名称
+        pid: '', // 上级类别ID
+        newPid: '', // 添加积分规则用到的pid
+        ruleName: '', // 积分规则名称
+        pointValue: '', // 加减积分
+        applyFlag: '0' // 允许申请0，不允许申请1
+      },
+      ruleform:{}, // 积分规则查询相关数据，由于只是修改名称/分值/是否申请 所以之前的数据不做改变只做展示用 全部放在form里面
+      typeform: {}, // 积分二级分类
+      rules: {
+        pid: [{ required: true, message: '请选择分类', trigger: 'blur' }],
+        categoryName: [{ required: true, message: '类别名称不能为空', trigger: 'blur' }],
+        ruleName: [{ required: true, message: '规则名称不能为空', trigger: 'blur' }],
+        pointValue: [{ required: true, message: '加减分值不能为空', trigger: 'blur' }],
+        applyFlag: [{ required: true, message: '请选择积分申请', trigger: 'blur' }]
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  async created () {
+    this.getTableData()
+    this.pageLoading = true
+  },
+  mounted () {
+    this.$nextTick(() => {
+      this.sHeight = 210
+    })
+  },
+  methods: {
+    // 列表添加相关
+    handleAdd (type, addType, id, pid, categoryName) {
+      if (type === '1') {
+        this.form.pid = ''
+        this.form.categoryName = ''
+      }
+      this.addLevel = type
+      this.addType = addType
+      if (type == '2') {
+        this.form.pid = id
+      }
+
+      if  (type == '3') {
+        this.form.pid = pid
+        this.form.newPid = id
+        this.form.categoryName = categoryName
+      }
+      this.dialogVisible = true
+    },
+    handlerCancle () {
+      this.dialogVisible = false
+    },
+    // 列表修改点击事件
+    async handleEdit (row, addType, level) {
+      console.log(addType, level)
+      let url = ''
+      if (level === '4') {
+        url = `/point/additiverule/categorydetail/${row.id}`
+      } else if(level === '5') {
+        url = `/point/additiverule/ruledetail/${row.id}`
+
+        await this.$http.post(`/point/additiverule/categorydetail/${row.pid}`).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.form.pid = res.data.pid // 分类
+            this.form.categoryName = res.data.categoryName // 类别名称
+            this.form.newPid = res.data.id // 类别 id
+          }
+        })
+      }
+      this.addLevel = level
+      this.addType = addType
+      this.dialogVisible = true
+      await this.$http.post(url).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        } else {
+          if (this.addLevel === '4' ) {
+            this.form.pid = res.data.pid // 分类
+            this.form.categoryName = res.data.categoryName // 类别名称
+            this.form.newPid = res.data.id // 类别 id
+            this.typeform = { ...res.data }
+          } else {
+            this.form.applyFlag = res.data.applyFlag // 积分规则 只有这三块内容可以修改
+            this.form.ruleName = res.data.ruleName
+            this.form.pointValue = res.data.pointValue
+            this.ruleform = { ...res.data }
+          }
+
+        }
+      })
+    },
+    // 添加积分类别
+    async addLevelFirst () {
+      const _form = {
+        pid: this.form.pid, // 上级类别ID
+        categoryName: this.form.categoryName // 类别名称
+      }
+      await this.$http
+        .post('/point/additiverule/addcategory', _form)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.dialogVisible = false
+            this.getTableData()
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+      this.btnLoading = false
+    },
+    // 添加积分规则
+    async addLevelChild () {
+      const _form = {
+        ruleName: this.form.ruleName,
+        pid: this.form.newPid,
+        pointValue: this.form.pointValue,
+        applyFlag: this.form.applyFlag
+      }
+      await this.$http
+        .post('/point/additiverule/addrule', _form)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.dialogVisible = false
+            this.getTableData()
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+      this.form.ruleName = ''
+      this.form.pointValue = ''
+      this.btnLoading = false
+    },
+    // 提交按钮
+    handleSUbmit () {
+      this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          this.btnLoading = true
+          if (this.addType == 'add') {
+            if (this.addLevel == '1' || this.addLevel == '2') this.addLevelFirst()
+            else this.addLevelChild()
+          } else this.editCate()
+
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    // 修改提交
+    async editCate () {
+      if (this.addLevel === '4' ) { // 分类修改
+        this.typeform.categoryName = this.form.categoryName
+        this.typeform.type = 'category'
+      } else {
+        this.ruleform.ruleName = this.form.ruleName
+        this.ruleform.pointValue = this.form.pointValue
+        this.ruleform.applyFlag = this.form.applyFlag
+        this.ruleform.type = 'rule'
+      }
+      console.log(JSON.stringify(this.ruleform))
+      await this.$http
+        .post('/point/additiverule/modify', this.addLevel==='4' ? this.typeform : this.ruleform)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.dialogVisible = false
+            this.getTableData()
+            this.$message.success('保存成功')
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+      this.btnLoading = false
+    },
+    // 删除
+    handleDel (row) {
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        let params = [row.id]
+      console.log('row1', row)
+        this.$http.post('/point/additiverule/delete', params)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg)
+            } else {
+              console.log('row3', row)
+              this.$message.success('删除成功')
+              this.getTableData()
+            }
+          })
+          .catch((err) => {
+            console.log('row4', err)
+            return this.$message.error('网络错误')
+          })
+      }).catch(err => {
+          console.log(err)
+      });
+    },
+    // 查询积分类别规则列表
+    async getTableData () {
+      this.tableData = []
+      this.tableLoading = true
+      let params = {}
+      await this.$http.post('/point/additiverule/list4tree', params).then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg)
+            } else {
+              let list = []
+              if (res.data.length > 0) {
+                res.data.forEach(element => { // 一级循环
+                  if (element.pid === '0') {
+                    element.children = []
+                    list.push(element)
+                    this.typeList.push({ //类别
+                      value: element.id,
+                      label: element.categoryName
+                    })
+                  }
+                });
+              }
+              if (list.length > 0) { // 二级循环
+                res.data.forEach(element => {
+                  if (element.pid) {
+                    list.forEach((item, index) => {
+                      if (element.pid === item.id) {
+                        element.children = []
+                        list[index].children.push(element)
+                      }
+                    });
+                  }
+                });
+              }
+              if (list.length > 0) {  // 三级循环
+                res.data.forEach(element => {
+                  if (element.pid) {
+                    list.forEach((item, index) => {
+                      if (item.children.length > 0 ) {
+                        item.children.forEach((itemC, indexC) => {
+                           if (element.pid === itemC.id) {
+                              list[index].children[indexC].children.push(element)
+                           }
+                        });
+                      }
+                    });
+                  }
+                });
+              }
+              this.tableData = list.map((item, index) => {
+                return {
+                  ...item,
+                  index: index + 1,
+                  children: item.children.map(n => {
+                    return {
+                      ...n
+                    }
+                  })
+                }
+              })
+            }
+          })
+        this.tableLoading = false
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.resi-container .resi-card-table {
+  ::v-deep .el-table {
+    th {
+      color: #fff;
+      background-color: rgba(33, 149, 254, 1);
+    }
+
+    .cell {
+      span:nth-of-type(3) {
+        display: inline-block;
+        width: 90%;
+        word-break: break-all;
+      }
+    }
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+  ::v-deep .btn-color-del {
+    margin-left: 10px;
+    color: rgba(213, 16, 16, 1);
+  }
+  ::v-deep .btn-color-2j {
+    margin-left: 10px;
+    color: #fdaf30;
+  }
+  ::v-deep .btn-color-1j {
+    margin-left: 10px;
+    color: #3cb357;
+  }
+  ::v-deep .btn-color-edit {
+    color: rgba(0, 167, 169, 1);
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.resi-row-btn {
+  display: flex;
+  margin-bottom: 13px;
+  ::v-deep .el-button {
+    // margin-left: 10px;
+    border: 0;
+  }
+  ::v-deep .el-select {
+    margin-right: 10px;
+  }
+  .el-button--success {
+    background: rgba(34, 193, 195, 1);
+  }
+}
+.avatar-uploader {
+  ::v-deep .el-upload {
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .el-upload:hover {
+    border-color: #409eff;
+  }
+  .avatar {
+    width: 70px;
+    height: 70px;
+    display: block;
+  }
+  .avatar-uploader-icon {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    font-size: 28px;
+    color: #8c939d;
+    width: 70px;
+    height: 70px;
+    line-height: 70px;
+    text-align: center;
+  }
+}
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+</style>