Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

project/sass/apps/AppGridBlock/components/list.vue

@@ -66,7 +66,8 @@
                 fileName="网格区块"
             >
               <el-button icon="iconfont iconExported" size="small"
-                >导出全部</el-button
+              >导出全部
+              </el-button
               >
             </ai-download>
             <ai-import
@@ -85,7 +86,8 @@
                 </p>
               </template>
               <el-button size="small" icon="iconfont iconImport"
-                >导入</el-button
+              >导入
+              </el-button
               >
             </ai-import>
           </template>
@@ -117,7 +119,8 @@
             <template slot-scope="{ row }">
               <div class="flex-box">
                 <div v-for="(item, index) in row.girdMemberNames" v-show="index < 3" :key="index">
-                  <AiOpenData type="userName" :openid="item"></AiOpenData><span v-if="index < 2 && index < row.girdMemberNames.length - 1">、</span>
+                  <AiOpenData type="userName" :openid="item"></AiOpenData>
+                  <span v-if="index < 2 && index < row.girdMemberNames.length - 1">、</span>
                 </div>
               </div>
             </template>
@@ -167,7 +170,8 @@
             v-if="editRow.plottingStatus == 1"
         >
           <el-button type="primary" size="mini" @click="beginPoltting()"
-            >开始编辑</el-button
+          >开始编辑
+          </el-button
           >
           <el-button size="mini" @click="finishPoltting()">结束编辑</el-button>
         </el-button-group>
@@ -176,7 +180,8 @@
             v-if="editRow.plottingStatus == 0"
         >
           <el-button size="mini" @click="draw('polygon')"
-            >开始绘制多边形</el-button
+          >开始绘制多边形
+          </el-button
           >
           <!-- <el-button  size="mini" @click="close()">关闭绘制</el-button> -->
           <el-button size="mini" @click="clear()">清除绘制</el-button>
@@ -185,7 +190,8 @@
       <div class="dialog-footer" slot="footer">
         <el-button size="medium" @click="showMap = false">取消</el-button>
         <el-button type="primary" size="medium" @click="confirm()"
-          >确认</el-button
+        >确认
+        </el-button
         >
       </div>
     </ai-dialog>
@@ -367,7 +373,8 @@ export default {
           }
         });
       })
-          .catch(() => {});
+      .catch(() => {
+      });
     },
     deleteTree(ids) {
       ids &&
@@ -387,7 +394,8 @@ export default {
           }
         });
       })
-          .catch(() => {});
+      .catch(() => {
+      });
     },
     getList() {
       this.instance
@@ -569,16 +577,12 @@ export default {
         path = [...this.path];
       }
       delete this.editRow.points;
-      this.instance
-        .post(
-          `/app/appgirdinfo/addOrUpdate`,
-          {
+      let {girdMemberNames} = this.editRow
+      this.instance.post(`/app/appgirdinfo/addOrUpdate`, {
         ...this.editRow,
         points: path,
-          },
-          null
-        )
-        .then((res) => {
+        girdMemberNames: girdMemberNames?.toString()
+      }).then((res) => {
         if (res.code == 0) {
           this.getList();
           this.showMap = false;
@@ -611,6 +615,7 @@ export default {
 .app-grid-block {
   width: 100%;
   height: 100%;
+
   ::v-deep .el-tree {
     background: transparent;