From 1edfa2a21e3ad647920e5b4e56e0eb648aa50197 Mon Sep 17 00:00:00 2001
From: SHICHAO <17568097882@163.com>
Date: Sun, 27 Aug 2023 16:16:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=8C=96=E6=8A=A4=E6=9E=97?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PermissionBtn/index.vue            | 4 +---
 src/components/PermissionMenu/index.vue           | 5 +----
 src/views/gridman/forestranger/widget/AddForm.vue | 6 ++++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/PermissionBtn/index.vue b/src/components/PermissionBtn/index.vue
index e7bb27f..ac0d13e 100644
--- a/src/components/PermissionBtn/index.vue
+++ b/src/components/PermissionBtn/index.vue
@@ -53,9 +53,7 @@ export default {
   mounted() {
     var route = this.$route
     var elements = route.meta.elements
-    this.buttons = elements.sort((a, b) => {
-      return a.sort - b.sort
-    })
+    this.buttons = elements
   },
   methods: {
     fetchData() {
diff --git a/src/components/PermissionMenu/index.vue b/src/components/PermissionMenu/index.vue
index 2c17b79..e8cc516 100644
--- a/src/components/PermissionMenu/index.vue
+++ b/src/components/PermissionMenu/index.vue
@@ -45,10 +45,7 @@ export default {
   mounted() {
     var route = this.$route
     var elements = route.meta.elements
-    console.log(elements)
-    this.buttons = elements.sort((a, b) => {
-      return a.sort - b.sort
-    })
+    this.buttons = elements
 
     for (var btn of this.buttons) {
       var item= { text: btn.name, icon:btn.icon,id:btn.domId, click:(event) =>{var evt = event || window.event;var src = evt.target || evt.srcElement;if(src.tagName!='DIV')src=src.parentNode;this.$emit('btn-event',src.id)}}
diff --git a/src/views/gridman/forestranger/widget/AddForm.vue b/src/views/gridman/forestranger/widget/AddForm.vue
index ca57d6c..ea7277c 100644
--- a/src/views/gridman/forestranger/widget/AddForm.vue
+++ b/src/views/gridman/forestranger/widget/AddForm.vue
@@ -113,11 +113,13 @@
         getMethodCommon("/FireCodeApp/GetForestryUserById?id=" + this.detailInfo[0].Id, {}).then(res => {
           if (res.code == 200) {
             this.addForm = res.data[0]
-            var areaId = this.addForm.areaId.split(',')
+            if(this.addForm.areaId){
+              var areaId = this.addForm.areaId.split(',')
+              this.addForm.areaId = turnNum(areaId)
+            }
             var turnNum = function (nums) {
               return nums.map(Number);
             }
-            this.addForm.areaId = turnNum(areaId)
             if (this.addForm.Sex == 0) {
               this.addForm.Sex = '男'
             } else {