From aa9a3a92f1b9cf4d817dae840af85c1f341f0b18 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Sat, 8 Oct 2022 17:15:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addResource.vue                | 23 ++++++++-----------
 .../components/resourceManagement.vue         |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/project/pengliuyang/apps/AppCommunityResource/components/addResource.vue b/project/pengliuyang/apps/AppCommunityResource/components/addResource.vue
index a1003672..95d3a24a 100644
--- a/project/pengliuyang/apps/AppCommunityResource/components/addResource.vue
+++ b/project/pengliuyang/apps/AppCommunityResource/components/addResource.vue
@@ -19,7 +19,7 @@
               </el-form-item>
 
               <el-form-item style="width: 100%" label="地区" prop="areaId">
-                <ai-area-get v-model="form.areaId" :instance="instance" @select="handleAreaSelect"/>
+                <ai-area-get v-model="form.areaId" :instance="instance" @select="handleAreaSelect" :root="areaId"/>
               </el-form-item>
 
               <el-form-item style="width: 100%" label="地址" prop="address">
@@ -75,8 +75,8 @@ export default {
     permissions: Function,
   },
   data() {
-    var locate =  (rule, value, callback) => {
-      if(!this.form.lat.length || !this.form.lng.length) {
+    var validLocation =  (rule, value, callback) => {
+      if(!this.form.lat || !this.form.lng) {
         return callback(new Error('请标绘地理位置'))
       } else {
         callback()
@@ -107,23 +107,18 @@ export default {
       },
       showMap: false,
       searchPlace: '',
-      // locate
-    }
-  },
-  created() {
-    this.getCategoryList()
-  },
-  computed: {
-    rules() {
-      return {
+      rules: {
         categoryId: [{ required: true, message: '请选择资源分类', trigger: 'blur' }],
         resourceName: [{ required: true, message: '请输入资源名称', trigger: 'blur' }],
         areaId: [{ required: true, message: '选择地区', trigger: 'change' }],
         address: [{ required: true, message: '请输入地址', trigger: 'change' }],
-        location: [{ required: true, validator: this.locate, trigger: 'change' }],
-      }
+        location: [{ required: true, validator: validLocation, trigger: 'change' }],
+      },
     }
   },
+  created() {
+    this.getCategoryList()
+  },
   methods: {
     cancel() {
       // currentPage: resourceManagement
diff --git a/project/pengliuyang/apps/AppCommunityResource/components/resourceManagement.vue b/project/pengliuyang/apps/AppCommunityResource/components/resourceManagement.vue
index fadc691b..29231e61 100644
--- a/project/pengliuyang/apps/AppCommunityResource/components/resourceManagement.vue
+++ b/project/pengliuyang/apps/AppCommunityResource/components/resourceManagement.vue
@@ -62,7 +62,7 @@ export default {
       this.instance.post(`/app/appresourceinfo/list`,null,{
         params: {
           ...this.search,
-          // areaId: this.areaId,
+          areaId: this.areaId,
         }
       }).then(res=> {
         if(res?.data) {