From 32063da2781cd49a7e731269286b276b2f459838 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 24 Sep 2020 19:30:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90grid=E4=BF=AE=E6=94=B9=E3=80=91-?=
 =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-09-24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/issue/hottest-issue-list.vue     | 10 +++----
 .../issue-classified-statistic-second.vue     | 12 ++++----
 .../issue/issue-classified-statistic.vue      | 18 ++++++------
 .../analysis/issue/latest-issue-list.vue      | 10 +++----
 .../analysis/item/difficult-Item-list.vue     | 10 +++----
 .../analysis/item/hottest-item-list.vue       | 10 +++----
 .../analysis/item/report-solved-item-list.vue | 10 +++----
 .../item/report-unsolved-item-list.vue        | 10 +++----
 .../analysis/item/unsolved-item-list.vue      | 10 +++----
 .../analysis/topic/hottest-topic-list.vue     | 10 +++----
 .../analysis/topic/latest-topic-list.vue      | 10 +++----
 .../modules/analysis/user/gridopening.vue     | 16 +++++------
 .../metausergridopining-add-or-update.vue     |  8 +++---
 .../analysis/user/metausergridopining.vue     |  6 ++--
 src/views/modules/analysis/user/party.vue     | 16 +++++------
 src/views/modules/analysis/user/register.vue  | 22 +++++++--------
 .../honest/newshonest-add-or-update.vue       |  6 ++--
 .../modules/honest/newshonest-publish.vue     | 12 ++++----
 src/views/modules/news/allnews.vue            | 18 ++++++------
 .../modules/news/allnotice-add-or-update.vue  | 22 +++++++--------
 src/views/modules/news/allnotice.vue          |  8 +++---
 .../modules/news/banner-add-or-update.vue     | 24 ++++++++--------
 src/views/modules/news/news-add-or-update.vue | 22 +++++++--------
 src/views/modules/news/news-publish.vue       | 28 +++++++++----------
 src/views/modules/news/news.vue               | 20 ++++++-------
 src/views/modules/news/newsdraft.vue          | 18 ++++++------
 src/views/modules/news/notice.vue             |  4 +--
 .../modules/property/gridpartymembergroup.vue | 12 ++++----
 src/views/modules/property/group.vue          |  6 ++--
 src/views/modules/property/leaderboard.vue    | 10 +++----
 .../propertyproject-add-or-update.vue         |  8 +++---
 .../modules/property/propertyproject.vue      |  4 +--
 src/views/modules/property/topic-list.vue     | 10 +++----
 .../modules/workRecord/monthrecordinfo.vue    |  8 +++---
 .../workRecord/monthrecordinfoDetail.vue      |  6 ++--
 35 files changed, 217 insertions(+), 217 deletions(-)

diff --git a/src/views/modules/analysis/issue/hottest-issue-list.vue b/src/views/modules/analysis/issue/hottest-issue-list.vue
index 2fa8616..9250f98 100644
--- a/src/views/modules/analysis/issue/hottest-issue-list.vue
+++ b/src/views/modules/analysis/issue/hottest-issue-list.vue
@@ -86,7 +86,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         startTime: '',
         endTime: '',
         topicContent: ''
@@ -121,22 +121,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
diff --git a/src/views/modules/analysis/issue/issue-classified-statistic-second.vue b/src/views/modules/analysis/issue/issue-classified-statistic-second.vue
index 433d9ce..3d5575f 100644
--- a/src/views/modules/analysis/issue/issue-classified-statistic-second.vue
+++ b/src/views/modules/analysis/issue/issue-classified-statistic-second.vue
@@ -95,7 +95,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         startTime: '',
         endTime: '',
         sort: 'desc',
@@ -141,22 +141,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
@@ -182,7 +182,7 @@ export default {
     //     this.$refs.issueClassifiedStatisticThird.dataForm.categoryName = categoryName
     //     this.$refs.issueClassifiedStatisticThird.dataForm.streetId = this.dataForm.streetId
     //     this.$refs.issueClassifiedStatisticThird.dataForm.communityId = this.dataForm.communityId
-    //     this.$refs.issueClassifiedStatisticThird.dataForm.gridId = this.dataForm.gridId
+    //     this.$refs.issueClassifiedStatisticThird.dataForm.deptId = this.dataForm.deptId
     //     this.$refs.issueClassifiedStatisticThird.dataForm.startTime = this.dataForm.startTime
     //     this.$refs.issueClassifiedStatisticThird.dataForm.endTime = this.dataForm.endTime
     //     this.$refs.issueClassifiedStatisticThird.dataForm.sort = this.dataForm.sort
diff --git a/src/views/modules/analysis/issue/issue-classified-statistic.vue b/src/views/modules/analysis/issue/issue-classified-statistic.vue
index 1447964..6ea9d8d 100644
--- a/src/views/modules/analysis/issue/issue-classified-statistic.vue
+++ b/src/views/modules/analysis/issue/issue-classified-statistic.vue
@@ -100,11 +100,11 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         sort: 'desc',
         categoryLevel: '1',
-        startTime:'',
-        endTime:''
+        startTime: '',
+        endTime: ''
       },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -154,22 +154,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
@@ -190,7 +190,7 @@ export default {
         this.$refs.issueClassifiedStatisticSecond.dataForm.categoryName = categoryName
         this.$refs.issueClassifiedStatisticSecond.dataForm.streetId = this.dataForm.streetId
         this.$refs.issueClassifiedStatisticSecond.dataForm.communityId = this.dataForm.communityId
-        this.$refs.issueClassifiedStatisticSecond.dataForm.gridId = this.dataForm.gridId
+        this.$refs.issueClassifiedStatisticSecond.dataForm.deptId = this.dataForm.deptId
         this.$refs.issueClassifiedStatisticSecond.dataForm.startTime = this.dataForm.startTime
         this.$refs.issueClassifiedStatisticSecond.dataForm.endTime = this.dataForm.endTime
         this.$refs.issueClassifiedStatisticSecond.dataForm.sort = this.dataForm.sort
@@ -208,7 +208,7 @@ export default {
         this.$refs.issueClassifiedStatisticSecond.dataForm.categoryName = categoryName
         this.$refs.issueClassifiedStatisticSecond.dataForm.streetId = this.dataForm.streetId
         this.$refs.issueClassifiedStatisticSecond.dataForm.communityId = this.dataForm.communityId
-        this.$refs.issueClassifiedStatisticSecond.dataForm.gridId = this.dataForm.gridId
+        this.$refs.issueClassifiedStatisticSecond.dataForm.deptId = this.dataForm.deptId
         this.$refs.issueClassifiedStatisticSecond.dataForm.startTime = this.dataForm.startTime
         this.$refs.issueClassifiedStatisticSecond.dataForm.endTime = this.dataForm.endTime
         this.$refs.issueClassifiedStatisticSecond.dataForm.sort = this.dataForm.sort
diff --git a/src/views/modules/analysis/issue/latest-issue-list.vue b/src/views/modules/analysis/issue/latest-issue-list.vue
index df6135e..65f2c2d 100644
--- a/src/views/modules/analysis/issue/latest-issue-list.vue
+++ b/src/views/modules/analysis/issue/latest-issue-list.vue
@@ -82,7 +82,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         startTime: '',
         endTime: '',
         topicContent: ''
@@ -117,22 +117,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
diff --git a/src/views/modules/analysis/item/difficult-Item-list.vue b/src/views/modules/analysis/item/difficult-Item-list.vue
index fb4951d..f3dd60f 100644
--- a/src/views/modules/analysis/item/difficult-Item-list.vue
+++ b/src/views/modules/analysis/item/difficult-Item-list.vue
@@ -178,7 +178,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         orderType: '',
         changeItemStartTime: '',
         changeItemEndTime: '',
@@ -234,22 +234,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
diff --git a/src/views/modules/analysis/item/hottest-item-list.vue b/src/views/modules/analysis/item/hottest-item-list.vue
index 2ac28da..3a9540a 100644
--- a/src/views/modules/analysis/item/hottest-item-list.vue
+++ b/src/views/modules/analysis/item/hottest-item-list.vue
@@ -82,7 +82,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         startTime: '',
         endTime: '',
         searchContent: ''
@@ -117,22 +117,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
diff --git a/src/views/modules/analysis/item/report-solved-item-list.vue b/src/views/modules/analysis/item/report-solved-item-list.vue
index 7c5307c..fde94c8 100644
--- a/src/views/modules/analysis/item/report-solved-item-list.vue
+++ b/src/views/modules/analysis/item/report-solved-item-list.vue
@@ -106,7 +106,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         reportDept: '',
         reportStartTime: '',
         reportEndTime: '',
@@ -145,22 +145,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     },
     'streetIds': function (val) {
diff --git a/src/views/modules/analysis/item/report-unsolved-item-list.vue b/src/views/modules/analysis/item/report-unsolved-item-list.vue
index 13376c9..5d522bd 100644
--- a/src/views/modules/analysis/item/report-unsolved-item-list.vue
+++ b/src/views/modules/analysis/item/report-unsolved-item-list.vue
@@ -81,7 +81,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         reportDept: '',
         reportStartTime: '',
         reportEndTime: '',
@@ -120,22 +120,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     },
     'streetIds': function (val) {
diff --git a/src/views/modules/analysis/item/unsolved-item-list.vue b/src/views/modules/analysis/item/unsolved-item-list.vue
index 1324794..07f50a4 100644
--- a/src/views/modules/analysis/item/unsolved-item-list.vue
+++ b/src/views/modules/analysis/item/unsolved-item-list.vue
@@ -81,7 +81,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         startTime: '',
         endTime: '',
         searchContent: ''
@@ -132,22 +132,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
diff --git a/src/views/modules/analysis/topic/hottest-topic-list.vue b/src/views/modules/analysis/topic/hottest-topic-list.vue
index d026b2f..9dae724 100644
--- a/src/views/modules/analysis/topic/hottest-topic-list.vue
+++ b/src/views/modules/analysis/topic/hottest-topic-list.vue
@@ -85,7 +85,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         startTime: '',
         endTime: '',
         topicContent: ''
@@ -121,22 +121,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
diff --git a/src/views/modules/analysis/topic/latest-topic-list.vue b/src/views/modules/analysis/topic/latest-topic-list.vue
index 5ca35fa..c4e0b6d 100644
--- a/src/views/modules/analysis/topic/latest-topic-list.vue
+++ b/src/views/modules/analysis/topic/latest-topic-list.vue
@@ -82,7 +82,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         startTime: '',
         endTime: '',
         topicContent: ''
@@ -117,22 +117,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
diff --git a/src/views/modules/analysis/user/gridopening.vue b/src/views/modules/analysis/user/gridopening.vue
index 6126f4c..80c84ef 100644
--- a/src/views/modules/analysis/user/gridopening.vue
+++ b/src/views/modules/analysis/user/gridopening.vue
@@ -418,32 +418,32 @@ export default {
         this.communityList = []
         this.gridList = []
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
         return
       }
       this.dataForm.streetId = event
       let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
       this.initDeptIdAndName(choosenItem)
-      this.dataForm.communityId = this.dataForm.gridId = null
+      this.dataForm.communityId = this.dataForm.deptId = null
       this.communityList = this.gridList = []
       this.getDeptInfoList('community', event)
     },
     changeCommunity (event) {
       if (this.dataForm.communityId === '') {
         this.gridList = []
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
         return
       }
       this.communityId = event
       let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
       this.initDeptIdAndName(choosenItem)
-      this.dataForm.gridId = null
+      this.dataForm.deptId = null
       this.gridList = []
       this.getDeptInfoList('grid', event)
     },
     changeGrid (event) {
-      this.dataForm.gridId = event
-      let choosenItem = this.gridList.filter(item => item.id === this.gridId)[0]
+      this.dataForm.deptId = event
+      let choosenItem = this.gridList.filter(item => item.id === this.deptId)[0]
       this.initDeptIdAndName(choosenItem)
     },
     initDeptIdAndName (choosenItem) {
@@ -554,9 +554,9 @@ export default {
   watch: {
     'deptIdList': function (val) {
       if (val.length !== 0) {
-        this.dataForm.gridId = val[val.length - 1]
+        this.dataForm.deptId = val[val.length - 1]
       } else {
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
     }
   }
diff --git a/src/views/modules/analysis/user/metausergridopining-add-or-update.vue b/src/views/modules/analysis/user/metausergridopining-add-or-update.vue
index 1eb597f..74fd56b 100644
--- a/src/views/modules/analysis/user/metausergridopining-add-or-update.vue
+++ b/src/views/modules/analysis/user/metausergridopining-add-or-update.vue
@@ -1,8 +1,8 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="网格id" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="网格id"></el-input>
+          <el-form-item label="网格id" prop="deptId">
+          <el-input v-model="dataForm.deptId" placeholder="网格id"></el-input>
       </el-form-item>
           <el-form-item label="用户总数" prop="registerCount">
           <el-input v-model="dataForm.registerCount" placeholder="用户总数"></el-input>
@@ -80,7 +80,7 @@ export default {
       visible: false,
       dataForm: {
         id: '',
-        gridId: '',
+        deptId: '',
         registerCount: '',
         partyCount: '',
         residentCount: '',
@@ -107,7 +107,7 @@ export default {
   computed: {
     dataRule () {
       return {
-        gridId: [
+        deptId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         registerCount: [
diff --git a/src/views/modules/analysis/user/metausergridopining.vue b/src/views/modules/analysis/user/metausergridopining.vue
index 0edf955..61afe8d 100644
--- a/src/views/modules/analysis/user/metausergridopining.vue
+++ b/src/views/modules/analysis/user/metausergridopining.vue
@@ -48,7 +48,7 @@
                          label="主键"
                          header-align="center"
                          align="center"></el-table-column> -->
-        <!-- <el-table-column prop="gridId"
+        <!-- <el-table-column prop="deptId"
                          label="网格id"
                          header-align="center"
                          align="center"></el-table-column> -->
@@ -185,9 +185,9 @@ export default {
     'deptIdList': function (val) {
       console.log(this.deptIdList)
       if (val.length !== 0) {
-        this.dataForm.gridId = val[val.length - 1]
+        this.dataForm.deptId = val[val.length - 1]
       } else {
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
     }
   }
diff --git a/src/views/modules/analysis/user/party.vue b/src/views/modules/analysis/user/party.vue
index 84f2ff8..b7a9494 100644
--- a/src/views/modules/analysis/user/party.vue
+++ b/src/views/modules/analysis/user/party.vue
@@ -301,32 +301,32 @@ export default {
         this.communityList = []
         this.gridList = []
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
         return
       }
       this.dataForm.streetId = event
       let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
       this.initDeptIdAndName(choosenItem)
-      this.dataForm.communityId = this.dataForm.gridId = null
+      this.dataForm.communityId = this.dataForm.deptId = null
       this.communityList = this.gridList = []
       this.getDeptInfoList('community', event)
     },
     changeCommunity (event) {
       if (this.dataForm.communityId === '') {
         this.gridList = []
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
         return
       }
       this.communityId = event
       let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
       this.initDeptIdAndName(choosenItem)
-      this.dataForm.gridId = null
+      this.dataForm.deptId = null
       this.gridList = []
       this.getDeptInfoList('grid', event)
     },
     changeGrid (event) {
-      this.dataForm.gridId = event
-      let choosenItem = this.gridList.filter(item => item.id === this.gridId)[0]
+      this.dataForm.deptId = event
+      let choosenItem = this.gridList.filter(item => item.id === this.deptId)[0]
       this.initDeptIdAndName(choosenItem)
     },
     initDeptIdAndName (choosenItem) {
@@ -422,9 +422,9 @@ export default {
   watch: {
     'deptIdList': function (val) {
       if (val.length !== 0) {
-        this.dataForm.gridId = val[val.length - 1]
+        this.dataForm.deptId = val[val.length - 1]
       } else {
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
     }
   }
diff --git a/src/views/modules/analysis/user/register.vue b/src/views/modules/analysis/user/register.vue
index 64d82f2..a9f17f6 100644
--- a/src/views/modules/analysis/user/register.vue
+++ b/src/views/modules/analysis/user/register.vue
@@ -189,8 +189,8 @@ export default {
         noticeCount: '',
         partyCount: '',
         registerCount: '',
-        startTime:'',
-        endTime:''
+        startTime: '',
+        endTime: ''
       },
       time: '',
       options: [],
@@ -239,7 +239,7 @@ export default {
             return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
           }
         }
-      },
+      }
     }
   },
   created () {
@@ -326,32 +326,32 @@ export default {
         this.communityList = []
         this.gridList = []
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
         return
       }
       this.dataForm.streetId = event
       let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
       this.initDeptIdAndName(choosenItem)
-      this.dataForm.communityId = this.dataForm.gridId = null
+      this.dataForm.communityId = this.dataForm.deptId = null
       this.communityList = this.gridList = []
       this.getDeptInfoList('community', event)
     },
     changeCommunity (event) {
       if (this.dataForm.communityId === '') {
         this.gridList = []
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
         return
       }
       this.communityId = event
       let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
       this.initDeptIdAndName(choosenItem)
-      this.dataForm.gridId = null
+      this.dataForm.deptId = null
       this.gridList = []
       this.getDeptInfoList('grid', event)
     },
     changeGrid (event) {
-      this.dataForm.gridId = event
-      let choosenItem = this.gridList.filter(item => item.id === this.gridId)[0]
+      this.dataForm.deptId = event
+      let choosenItem = this.gridList.filter(item => item.id === this.deptId)[0]
       this.initDeptIdAndName(choosenItem)
     },
     initDeptIdAndName (choosenItem) {
@@ -454,9 +454,9 @@ export default {
   watch: {
     'deptIdList': function (val) {
       if (val.length !== 0) {
-        this.dataForm.gridId = val[val.length - 1]
+        this.dataForm.deptId = val[val.length - 1]
       } else {
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
     }
   }
diff --git a/src/views/modules/honest/newshonest-add-or-update.vue b/src/views/modules/honest/newshonest-add-or-update.vue
index 93192eb..76bf3f4 100644
--- a/src/views/modules/honest/newshonest-add-or-update.vue
+++ b/src/views/modules/honest/newshonest-add-or-update.vue
@@ -287,19 +287,19 @@ export default {
     changeStreet (event) {
       let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
       this.dataForm.street = choosenItem.name
-      this.dataForm.communityId = this.dataForm.gridId = this.dataForm.community = this.dataForm.grid = null
+      this.dataForm.communityId = this.dataForm.deptId = this.dataForm.community = this.dataForm.grid = null
       this.communityList = this.gridList = []
       this.getDeptInfoList('community', event)
     },
     changeCommunity (event) {
       let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
       this.dataForm.community = choosenItem.name
-      this.dataForm.gridId = this.dataForm.grid = null
+      this.dataForm.deptId = this.dataForm.grid = null
       this.gridList = []
       this.getDeptInfoList('grid', event)
     },
     changeGrid (event) {
-      let choosenItem = this.gridList.filter(item => item.id === this.dataForm.gridId)[0]
+      let choosenItem = this.gridList.filter(item => item.id === this.dataForm.deptId)[0]
       this.dataForm.grid = choosenItem.name
     },
     changeCaterory () {
diff --git a/src/views/modules/honest/newshonest-publish.vue b/src/views/modules/honest/newshonest-publish.vue
index e821bc5..36ba03b 100644
--- a/src/views/modules/honest/newshonest-publish.vue
+++ b/src/views/modules/honest/newshonest-publish.vue
@@ -100,7 +100,7 @@ export default {
         id: '',
         streetId: '',
         communityId: null,
-        gridId: null,
+        deptId: null,
         newsCateroryId: '',
         newsSubCateroryId: '',
         newsTitle: '',
@@ -161,7 +161,7 @@ export default {
     this.getListCategory()
     this.visible = true
     this.$nextTick(() => {
-      this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
+      this.dataForm.communityId = this.dataForm.streetId = this.dataForm.deptId = null
       // 富文本
       this.hideUpload = false
       this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
@@ -336,7 +336,7 @@ export default {
               this.dataForm.id = ''
               this.dataForm.streetId = ''
               this.dataForm.communityId = null
-              this.dataForm.gridId = null
+              this.dataForm.deptId = null
               this.dataForm.newsCateroryId = ''
               this.dataForm.newsSubCateroryId = ''
               this.dataForm.newsTitle = ''
@@ -353,7 +353,7 @@ export default {
               this.visible = false
               this.time = []
               this.quillEditor.root.innerHTML = ''
-              this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
+              this.dataForm.communityId = this.dataForm.streetId = this.dataForm.deptId = null
               this.communityList = this.gridList = []
             }
           })
@@ -383,7 +383,7 @@ export default {
               this.dataForm.id = ''
               this.dataForm.streetId = ''
               this.dataForm.communityId = null
-              this.dataForm.gridId = null
+              this.dataForm.deptId = null
               this.dataForm.newsCateroryId = ''
               this.dataForm.newsSubCateroryId = ''
               this.dataForm.newsTitle = ''
@@ -400,7 +400,7 @@ export default {
               this.visible = false
               this.time = []
               this.quillEditor.root.innerHTML = ''
-              this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
+              this.dataForm.communityId = this.dataForm.streetId = this.dataForm.deptId = null
               this.communityList = this.gridList = []
             }
           })
diff --git a/src/views/modules/news/allnews.vue b/src/views/modules/news/allnews.vue
index 26b85d7..eb6531c 100644
--- a/src/views/modules/news/allnews.vue
+++ b/src/views/modules/news/allnews.vue
@@ -173,7 +173,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         startTime: '',
         endTime: '',
         keyword: '',
@@ -263,32 +263,32 @@ export default {
         this.communityList = []
         this.gridList = []
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
         return
       }
       this.dataForm.streetId = event
       let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
       this.initDeptIdAndName(choosenItem)
-      this.dataForm.communityId = this.dataForm.gridId = null
+      this.dataForm.communityId = this.dataForm.deptId = null
       this.communityList = this.gridList = []
       this.getDeptInfoList('community', event)
     },
     changeCommunity (event) {
       if (this.dataForm.communityId === '') {
         this.gridList = []
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
         return
       }
       this.communityId = event
       let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
       this.initDeptIdAndName(choosenItem)
-      this.dataForm.gridId = null
+      this.dataForm.deptId = null
       this.gridList = []
       this.getDeptInfoList('grid', event)
     },
     changeGrid (event) {
-      this.dataForm.gridId = event
-      let choosenItem = this.gridList.filter(item => item.id === this.gridId)[0]
+      this.dataForm.deptId = event
+      let choosenItem = this.gridList.filter(item => item.id === this.deptId)[0]
       this.initDeptIdAndName(choosenItem)
     },
     initDeptIdAndName (choosenItem) {
@@ -395,9 +395,9 @@ export default {
   watch: {
     'deptIdList': function (val) {
       if (val.length !== 0) {
-        this.dataForm.gridId = val[val.length - 1]
+        this.dataForm.deptId = val[val.length - 1]
       } else {
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
     }
   }
diff --git a/src/views/modules/news/allnotice-add-or-update.vue b/src/views/modules/news/allnotice-add-or-update.vue
index 9cdb480..a8e4fb5 100644
--- a/src/views/modules/news/allnotice-add-or-update.vue
+++ b/src/views/modules/news/allnotice-add-or-update.vue
@@ -59,8 +59,8 @@ export default {
         street: null,
         communityId: null,
         community: null,
-        gridId: null,
-        grid: null,
+        deptId: null,
+        dept: null,
         noticeTitle: '',
         noticeContent: '',
         allDeptIdsShow: []
@@ -160,7 +160,7 @@ export default {
     init () {
       this.visible = true
       this.$nextTick(() => {
-        this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
+        this.dataForm.communityId = this.dataForm.streetId = this.dataForm.deptId = null
         this.communityList = this.gridList = []
         // 富文本
         this.hideUpload = false
@@ -189,13 +189,13 @@ export default {
         this.quillEditor.root.innerHTML = res.data.noticeContent
         if (this.dataForm.streetId) {
           if (this.dataForm.communityId === 0) {
-            this.dataForm.communityId = this.dataForm.gridId = null
+            this.dataForm.communityId = this.dataForm.deptId = null
           }
           this.getDeptInfoList('community', this.dataForm.streetId)
         }
         if (this.dataForm.communityId) {
-          if (this.dataForm.gridId === 0) {
-            this.dataForm.gridId = null
+          if (this.dataForm.deptId === 0) {
+            this.dataForm.deptId = null
           }
           this.getDeptInfoList('grid', this.dataForm.communityId)
         }
@@ -258,7 +258,7 @@ export default {
       let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
       this.dataForm.street = choosenItem.name
       // 清空社区与网格的变量值
-      this.dataForm.communityId = this.dataForm.gridId = this.dataForm.community = this.dataForm.grid = null
+      this.dataForm.communityId = this.dataForm.deptId = this.dataForm.community = this.dataForm.dept = null
       this.communityList = this.gridList = []
       // 获取街道下属社区
       this.getDeptInfoList('community', this.dataForm.streetId)
@@ -268,7 +268,7 @@ export default {
       let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
       this.dataForm.community = choosenItem.name
       // 情况网格的变量值
-      this.dataForm.gridId = this.dataForm.grid = null
+      this.dataForm.deptId = this.dataForm.dept = null
       this.gridList = []
       // 获取社区下属网格
       this.getDeptInfoList('grid', this.dataForm.communityId)
@@ -276,9 +276,9 @@ export default {
     changeGrid (item) {
       console.log(item)
       // 给网格变量赋值
-      // let choosenItem = this.gridList.filter(item => item.id === this.dataForm.gridId)[0]
-      // this.dataForm.grid = choosenItem.name
-      // this.dataForm = Object.assign(this.dataForm, { gridId: item })
+      // let choosenItem = this.gridList.filter(item => item.id === this.dataForm.deptId)[0]
+      // this.dataForm.dept = choosenItem.name
+      // this.dataForm = Object.assign(this.dataForm, { deptId: item })
       console.log(this.dataForm)
     }
 
diff --git a/src/views/modules/news/allnotice.vue b/src/views/modules/news/allnotice.vue
index 74e3a73..253427b 100644
--- a/src/views/modules/news/allnotice.vue
+++ b/src/views/modules/news/allnotice.vue
@@ -10,7 +10,7 @@
                        :options="options"
                        :props="{ checkStrictly: true }"
                        clearable></el-cascader>
-        </el-form-item>       
+        </el-form-item>
         <el-form-item>
           <el-form-item label="通知标题">
             <el-input v-model="dataForm.noticeTitle" @keyup.native="btKeyUpnoticeTitle"
@@ -125,7 +125,7 @@ export default {
       },
       dataForm: {
         noticeTitle: '',
-        gridId: ''
+        deptId: ''
       },
       options: [],
       deptIdList: []
@@ -164,8 +164,8 @@ export default {
       return '是'
     },
     showDeptNameFormatter: function (row, column) {
-      if (row.grid) {
-        return row.grid
+      if (row.dept) {
+        return row.dept
       }
       if (row.community) {
         return row.community
diff --git a/src/views/modules/news/banner-add-or-update.vue b/src/views/modules/news/banner-add-or-update.vue
index 58c296f..b6b7613 100644
--- a/src/views/modules/news/banner-add-or-update.vue
+++ b/src/views/modules/news/banner-add-or-update.vue
@@ -51,7 +51,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="所属网格">
-        <el-select v-model="dataForm.gridId"
+        <el-select v-model="dataForm.deptId"
                    @change="changeGrid"
                    placeholder="所属网格">
           <el-option v-for="item in gridList"
@@ -125,8 +125,8 @@ export default {
         street: '',
         communityId: '',
         community: '',
-        gridId: '',
-        grid: '',
+        deptId: '',
+        dept: '',
         position: '0',
         allDeptIdsShow: []
       },
@@ -159,7 +159,7 @@ export default {
         streetId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        gridId: [
+        deptId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         position: [
@@ -189,7 +189,7 @@ export default {
       this.visible = true
       this.isAble = false
       this.$nextTick(() => {
-        this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
+        this.dataForm.communityId = this.dataForm.streetId = this.dataForm.deptId = null
         this.communityList = this.gridList = []
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -206,13 +206,13 @@ export default {
         this.dataForm = res.data
         if (this.dataForm.streetId) {
           if (this.dataForm.communityId === 0) {
-            this.dataForm.communityId = this.dataForm.gridId = null
+            this.dataForm.communityId = this.dataForm.deptId = null
           }
           this.getDeptInfoList('community', this.dataForm.streetId)
         }
         if (this.dataForm.communityId) {
-          if (this.dataForm.gridId === 0) {
-            this.dataForm.gridId = null
+          if (this.dataForm.deptId === 0) {
+            this.dataForm.deptId = null
           }
           this.getDeptInfoList('grid', this.dataForm.communityId)
         }
@@ -285,7 +285,7 @@ export default {
       let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
       this.dataForm.street = choosenItem.name
       // 清空社区与网格的变量值
-      this.dataForm.communityId = this.dataForm.gridId = this.dataForm.community = this.dataForm.grid = null
+      this.dataForm.communityId = this.dataForm.deptId = this.dataForm.community = this.dataForm.dept = null
       this.communityList = this.gridList = []
       // 获取街道下属社区
       this.getDeptInfoList('community', this.dataForm.streetId)
@@ -295,15 +295,15 @@ export default {
       let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
       this.dataForm.community = choosenItem.name
       // 情况网格的变量值
-      this.dataForm.gridId = this.dataForm.grid = null
+      this.dataForm.deptId = this.dataForm.dept = null
       this.gridList = []
       // 获取社区下属网格
       this.getDeptInfoList('grid', this.dataForm.communityId)
     },
     changeGrid () {
       // 给网格变量赋值
-      let choosenItem = this.gridList.filter(item => item.id === this.dataForm.gridId)[0]
-      this.dataForm.grid = choosenItem.name
+      let choosenItem = this.gridList.filter(item => item.id === this.dataForm.deptId)[0]
+      this.dataForm.dept = choosenItem.name
     }
   }
 }
diff --git a/src/views/modules/news/news-add-or-update.vue b/src/views/modules/news/news-add-or-update.vue
index f911a74..76f53eb 100644
--- a/src/views/modules/news/news-add-or-update.vue
+++ b/src/views/modules/news/news-add-or-update.vue
@@ -39,7 +39,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="所属网格">
-        <el-select v-model="dataForm.gridId"
+        <el-select v-model="dataForm.deptId"
                    @change="changeGrid"
                    placeholder="所属网格">
           <el-option v-for="item in gridList"
@@ -146,8 +146,8 @@ export default {
         street: null,
         communityId: null,
         community: null,
-        gridId: null,
-        grid: null,
+        deptId: null,
+        dept: null,
         newsCateroryId: '',
         newsProperty: '',
         newsTitle: '',
@@ -201,7 +201,7 @@ export default {
     this.getListCategory()
     this.visible = true
     this.$nextTick(() => {
-      this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
+      this.dataForm.communityId = this.dataForm.streetId = this.dataForm.deptId = null
       // 富文本
       this.hideUpload = false
       this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
@@ -258,13 +258,13 @@ export default {
         this.quillEditor.root.innerHTML = res.data.newsContent
         if (this.dataForm.streetId) {
           if (this.dataForm.communityId === 0) {
-            this.dataForm.communityId = this.dataForm.gridId = null
+            this.dataForm.communityId = this.dataForm.deptId = null
           }
           this.getDeptInfoList('community', this.dataForm.streetId)
         }
         if (this.dataForm.communityId) {
-          if (this.dataForm.gridId === 0) {
-            this.dataForm.gridId = null
+          if (this.dataForm.deptId === 0) {
+            this.dataForm.deptId = null
           }
           this.getDeptInfoList('grid', this.dataForm.communityId)
         }
@@ -292,20 +292,20 @@ export default {
     changeStreet (event) {
       let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
       this.dataForm.street = choosenItem.name
-      this.dataForm.communityId = this.dataForm.gridId = this.dataForm.community = this.dataForm.grid = null
+      this.dataForm.communityId = this.dataForm.deptId = this.dataForm.community = this.dataForm.dept = null
       this.communityList = this.gridList = []
       this.getDeptInfoList('community', event)
     },
     changeCommunity (event) {
       let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
       this.dataForm.community = choosenItem.name
-      this.dataForm.gridId = this.dataForm.grid = null
+      this.dataForm.deptId = this.dataForm.dept = null
       this.gridList = []
       this.getDeptInfoList('grid', event)
     },
     changeGrid (event) {
-      let choosenItem = this.gridList.filter(item => item.id === this.dataForm.gridId)[0]
-      this.dataForm.grid = choosenItem.name
+      let choosenItem = this.gridList.filter(item => item.id === this.dataForm.deptId)[0]
+      this.dataForm.dept = choosenItem.name
     },
     changeCaterory () {
       // 给新闻类别变量赋值
diff --git a/src/views/modules/news/news-publish.vue b/src/views/modules/news/news-publish.vue
index 1795f20..a9c9108 100644
--- a/src/views/modules/news/news-publish.vue
+++ b/src/views/modules/news/news-publish.vue
@@ -39,7 +39,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="所属网格">
-            <el-select v-model="dataForm.gridId"
+            <el-select v-model="dataForm.deptId"
                        @change="changeGrid"
                        placeholder="所属网格">
               <el-option v-for="item in gridList"
@@ -153,7 +153,7 @@ export default {
         id: '',
         streetId: '',
         communityId: null,
-        gridId: null,
+        deptId: null,
         newsCateroryId: '',
         newsTitle: '',
         newsReleaseStartTime: '',
@@ -162,7 +162,7 @@ export default {
         newsImageUrl: '',
         street: '',
         community: null,
-        grid: null,
+        dept: null,
         newsProperty: '',
         allDeptIdsShow: []
       },
@@ -219,7 +219,7 @@ export default {
     this.getListCategory()
     this.visible = true
     this.$nextTick(() => {
-      this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
+      this.dataForm.communityId = this.dataForm.streetId = this.dataForm.deptId = null
       // 富文本
       this.hideUpload = false
       this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
@@ -280,7 +280,7 @@ export default {
       let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
       this.dataForm.street = choosenItem.name
       // 清空社区与网格的变量值
-      this.dataForm.communityId = this.dataForm.gridId = this.dataForm.community = this.dataForm.grid = null
+      this.dataForm.communityId = this.dataForm.deptId = this.dataForm.community = this.dataForm.dept = null
       this.communityList = this.gridList = []
       // 获取街道下属社区
       this.getDeptInfoList('community', this.dataForm.streetId)
@@ -290,15 +290,15 @@ export default {
       let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
       this.dataForm.community = choosenItem.name
       // 情况网格的变量值
-      this.dataForm.gridId = this.dataForm.grid = null
+      this.dataForm.deptId = this.dataForm.dept = null
       this.gridList = []
       // 获取社区下属网格
       this.getDeptInfoList('grid', this.dataForm.communityId)
     },
     changeGrid () {
       // 给网格变量赋值
-      let choosenItem = this.gridList.filter(item => item.id === this.dataForm.gridId)[0]
-      this.dataForm.grid = choosenItem.name
+      let choosenItem = this.gridList.filter(item => item.id === this.dataForm.deptId)[0]
+      this.dataForm.dept = choosenItem.name
     },
     changeCaterory () {
       // 给新闻类别变量赋值
@@ -376,7 +376,7 @@ export default {
               this.dataForm.id = ''
               this.dataForm.streetId = ''
               this.dataForm.communityId = null
-              this.dataForm.gridId = null
+              this.dataForm.deptId = null
               this.dataForm.newsCateroryId = ''
               this.dataForm.newsTitle = ''
               this.dataForm.newsReleaseStartTime = ''
@@ -385,12 +385,12 @@ export default {
               this.dataForm.newsImageUrl = ''
               this.dataForm.street = ''
               this.dataForm.community = null
-              this.dataForm.grid = null
+              this.dataForm.dept = null
               this.dataForm.newsProperty = ''
               this.visible = false
               this.time = []
               this.quillEditor.root.innerHTML = ''
-              this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
+              this.dataForm.communityId = this.dataForm.streetId = this.dataForm.deptId = null
               this.communityList = this.gridList = []
               this.isAble = false
             }
@@ -421,7 +421,7 @@ export default {
               this.dataForm.id = ''
               this.dataForm.streetId = ''
               this.dataForm.communityId = null
-              this.dataForm.gridId = null
+              this.dataForm.deptId = null
               this.dataForm.newsCateroryId = ''
               this.dataForm.newsTitle = ''
               this.dataForm.newsReleaseStartTime = ''
@@ -430,12 +430,12 @@ export default {
               this.dataForm.newsImageUrl = ''
               this.dataForm.street = ''
               this.dataForm.community = null
-              this.dataForm.grid = null
+              this.dataForm.dept = null
               this.dataForm.newsProperty = ''
               this.visible = false
               this.time = []
               this.quillEditor.root.innerHTML = ''
-              this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
+              this.dataForm.communityId = this.dataForm.streetId = this.dataForm.deptId = null
               this.communityList = this.gridList = []
               this.isAble = false
             }
diff --git a/src/views/modules/news/news.vue b/src/views/modules/news/news.vue
index b500757..9fc5c05 100644
--- a/src/views/modules/news/news.vue
+++ b/src/views/modules/news/news.vue
@@ -55,7 +55,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="所属网格">
-                  <el-select v-model="dataForm.gridId"
+                  <el-select v-model="dataForm.deptId"
                              @change="changeGrid"
                              clearable
                              placeholder="所属网格">
@@ -226,7 +226,7 @@
                     id: '',
                     streetId: '',
                     communityId: '',
-                    gridId: '',
+                    deptId: '',
                     startTime: '',
                     endTime: '',
                     keyword: '',
@@ -329,32 +329,32 @@
                     this.communityList = []
                     this.gridList = []
                     this.dataForm.communityId = ''
-                    this.dataForm.gridId = ''
+                    this.dataForm.deptId = ''
                     return
                 }
                 this.dataForm.streetId = event
                 let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
                 this.initDeptIdAndName(choosenItem)
-                this.dataForm.communityId = this.dataForm.gridId = null
+                this.dataForm.communityId = this.dataForm.deptId = null
                 this.communityList = this.gridList = []
                 this.getDeptInfoList('community', event)
             },
             changeCommunity(event) {
                 if (this.dataForm.communityId === '') {
                     this.gridList = []
-                    this.dataForm.gridId = ''
+                    this.dataForm.deptId = ''
                     return
                 }
                 this.communityId = event
                 let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
                 this.initDeptIdAndName(choosenItem)
-                this.dataForm.gridId = null
+                this.dataForm.deptId = null
                 this.gridList = []
                 this.getDeptInfoList('grid', event)
             },
             changeGrid(event) {
-                this.dataForm.gridId = event
-                let choosenItem = this.gridList.filter(item => item.id === this.gridId)[0]
+                this.dataForm.deptId = event
+                let choosenItem = this.gridList.filter(item => item.id === this.deptId)[0]
                 this.initDeptIdAndName(choosenItem)
             },
             initDeptIdAndName(choosenItem) {
@@ -467,9 +467,9 @@
             watch: {
                 'deptIdList': function (val) {
                     if (val.length !== 0) {
-                        this.dataForm.gridId = val[val.length - 1]
+                        this.dataForm.deptId = val[val.length - 1]
                     } else {
-                        this.dataForm.gridId = ''
+                        this.dataForm.deptId = ''
                     }
                 }
             }
diff --git a/src/views/modules/news/newsdraft.vue b/src/views/modules/news/newsdraft.vue
index 572fb63..4a927d2 100644
--- a/src/views/modules/news/newsdraft.vue
+++ b/src/views/modules/news/newsdraft.vue
@@ -168,7 +168,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         startTime: '',
         endTime: '',
         keyword: '',
@@ -249,32 +249,32 @@ export default {
         this.communityList = []
         this.gridList = []
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
         return
       }
       this.dataForm.streetId = event
       let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
       this.initDeptIdAndName(choosenItem)
-      this.dataForm.communityId = this.dataForm.gridId = null
+      this.dataForm.communityId = this.dataForm.deptId = null
       this.communityList = this.gridList = []
       this.getDeptInfoList('community', event)
     },
     changeCommunity (event) {
       if (this.dataForm.communityId === '') {
         this.gridList = []
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
         return
       }
       this.communityId = event
       let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
       this.initDeptIdAndName(choosenItem)
-      this.dataForm.gridId = null
+      this.dataForm.deptId = null
       this.gridList = []
       this.getDeptInfoList('grid', event)
     },
     changeGrid (event) {
-      this.dataForm.gridId = event
-      let choosenItem = this.gridList.filter(item => item.id === this.gridId)[0]
+      this.dataForm.deptId = event
+      let choosenItem = this.gridList.filter(item => item.id === this.deptId)[0]
       this.initDeptIdAndName(choosenItem)
     },
     initDeptIdAndName (choosenItem) {
@@ -369,9 +369,9 @@ export default {
   watch: {
     'deptIdList': function (val) {
       if (val.length !== 0) {
-        this.dataForm.gridId = val[val.length - 1]
+        this.dataForm.deptId = val[val.length - 1]
       } else {
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
     }
   }
diff --git a/src/views/modules/news/notice.vue b/src/views/modules/news/notice.vue
index 748758a..d665957 100644
--- a/src/views/modules/news/notice.vue
+++ b/src/views/modules/news/notice.vue
@@ -163,8 +163,8 @@ export default {
       return '是'
     },
     showDeptNameFormatter: function (row, column) {
-      if (row.grid) {
-        return row.grid
+      if (row.dept) {
+        return row.dept
       }
       if (row.community) {
         return row.community
diff --git a/src/views/modules/property/gridpartymembergroup.vue b/src/views/modules/property/gridpartymembergroup.vue
index ebe55b8..227b931 100644
--- a/src/views/modules/property/gridpartymembergroup.vue
+++ b/src/views/modules/property/gridpartymembergroup.vue
@@ -6,7 +6,7 @@
                :model="dataForm"
                @keyup.enter.native="getDataList()">
         <el-form-item label="网格">
-          <el-input v-model="dataForm.grid"
+          <el-input v-model="dataForm.dept"
                     placeholder="请输入网格名称"
                     clearable></el-input>
         </el-form-item>
@@ -36,7 +36,7 @@
                          label="社区"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="grid"
+        <el-table-column prop="dept"
                          label="网格"
                          header-align="center"
                          align="center"></el-table-column>
@@ -81,8 +81,8 @@ export default {
         streetId: '',
         community: '',
         communityId: '',
-        grid: '',
-        gridId: ''
+        dept: '',
+        deptId: ''
       }
     }
   },
@@ -95,8 +95,8 @@ export default {
         streetId: row.streetId,
         community: row.community,
         communityId: row.communityId,
-        grid: row.grid,
-        gridId: row.gridId
+        dept: row.dept,
+        deptId: row.deptId
       }]
       this.$http['post']('/property/epdc-app/group/createPartys', postForm).then(({ data: res }) => {
         if (res.code !== 0) {
diff --git a/src/views/modules/property/group.vue b/src/views/modules/property/group.vue
index 6ba0ecb..b902755 100644
--- a/src/views/modules/property/group.vue
+++ b/src/views/modules/property/group.vue
@@ -161,7 +161,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         state: '10'
       },
       postForm: {
@@ -204,7 +204,7 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
@@ -216,7 +216,7 @@ export default {
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
diff --git a/src/views/modules/property/leaderboard.vue b/src/views/modules/property/leaderboard.vue
index 58d0502..50fc95e 100644
--- a/src/views/modules/property/leaderboard.vue
+++ b/src/views/modules/property/leaderboard.vue
@@ -124,7 +124,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         startTime: '',
         endTime: ''
       },
@@ -169,22 +169,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
diff --git a/src/views/modules/property/propertyproject-add-or-update.vue b/src/views/modules/property/propertyproject-add-or-update.vue
index 87da247..e36f572 100644
--- a/src/views/modules/property/propertyproject-add-or-update.vue
+++ b/src/views/modules/property/propertyproject-add-or-update.vue
@@ -8,7 +8,7 @@
                           prop="allDeptIds">
                 <el-cascader v-model="dataForm.allDeptIds"
                              :options="options"
-                             ref="grid"
+                             ref="dept"
                              :props="{ checkStrictly: true }"
                              @change="handleChange"
                              filterable
@@ -47,8 +47,8 @@ export default {
       loading: true,
       dataForm: {
         id: '',
-        gridId: '',
-        grid: '',
+        deptId: '',
+        deptId: '',
         projectName: '',
         propertyName: '',
         propertyTel: '',
@@ -106,7 +106,7 @@ export default {
         })
     },
     handleChange (value) {
-      this.dataForm.gridId = value.slice(-1).shift()
+      this.dataForm.deptId = value.slice(-1).shift()
     },
     // 获取信息
     getInfo () {
diff --git a/src/views/modules/property/propertyproject.vue b/src/views/modules/property/propertyproject.vue
index fc9f3b5..342ccef 100644
--- a/src/views/modules/property/propertyproject.vue
+++ b/src/views/modules/property/propertyproject.vue
@@ -84,7 +84,7 @@ export default {
       },
       dataForm: {
         id: '',
-        gridId: '',
+        deptId: '',
         projectName: ''
       },
       options: [],
@@ -112,7 +112,7 @@ export default {
         })
     },
     handleChange (value) {
-      this.dataForm.gridId = value.slice(-1).shift()
+      this.dataForm.deptId = value.slice(-1).shift()
     },
     beforeDeleteHandle (id) {
       this.$confirm('删除物业项目将会解散物业项目群，是否继续操作?', this.$t('prompt.title'), {
diff --git a/src/views/modules/property/topic-list.vue b/src/views/modules/property/topic-list.vue
index 4bb7d0c..5260587 100644
--- a/src/views/modules/property/topic-list.vue
+++ b/src/views/modules/property/topic-list.vue
@@ -152,7 +152,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         startTime: '',
         endTime: '',
         groupId: '',
@@ -202,22 +202,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
diff --git a/src/views/modules/workRecord/monthrecordinfo.vue b/src/views/modules/workRecord/monthrecordinfo.vue
index 9fbaa0d..68b1eb0 100644
--- a/src/views/modules/workRecord/monthrecordinfo.vue
+++ b/src/views/modules/workRecord/monthrecordinfo.vue
@@ -88,8 +88,8 @@
             </div>
             <div style="width:1px;height:1px;"></div> -->
             <div>
-              <el-button size="mini" type="primary" icon="el-icon-edit" :disabled="scope.row.isUpdate == '0'" @click="addHandle(scope.row.id,'0',scope.row.caseId,scope.row.gridId,scope.row.personId,scope.row.isHaveSort)">{{ '修改月报' }}</el-button>
-              <el-button size="mini" type="primary" icon="el-icon-search" @click="addHandle(scope.row.id,'1',scope.row.caseId,scope.row.gridId,scope.row.personId,scope.row.isHaveSort)">{{ '查看月报' }}</el-button>
+              <el-button size="mini" type="primary" icon="el-icon-edit" :disabled="scope.row.isUpdate == '0'" @click="addHandle(scope.row.id,'0',scope.row.caseId,scope.row.deptId,scope.row.personId,scope.row.isHaveSort)">{{ '修改月报' }}</el-button>
+              <el-button size="mini" type="primary" icon="el-icon-search" @click="addHandle(scope.row.id,'1',scope.row.caseId,scope.row.deptId,scope.row.personId,scope.row.isHaveSort)">{{ '查看月报' }}</el-button>
             </div>
           </template>
         </el-table-column>
@@ -167,9 +167,9 @@ export default {
     this.getOptions()
   },
   methods: {
-    addHandle (id, disabled, caseId, gridId, personId, isHaveSort) {
+    addHandle (id, disabled, caseId, deptId, personId, isHaveSort) {
       this.$parent.selectComponent = 'MonthrecordinfoDetail'
-      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: id, disabled: disabled, caseId: caseId, gridId: gridId, personId: personId, isHaveSort: isHaveSort } })
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: id, disabled: disabled, caseId: caseId, deptId: deptId, personId: personId, isHaveSort: isHaveSort } })
     },
     addCaseHandle (infoId, disabled) {
       this.$parent.selectComponent = 'MonthexcellentcaseDetail'
diff --git a/src/views/modules/workRecord/monthrecordinfoDetail.vue b/src/views/modules/workRecord/monthrecordinfoDetail.vue
index d78fb2a..f5a755d 100644
--- a/src/views/modules/workRecord/monthrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/monthrecordinfoDetail.vue
@@ -112,7 +112,7 @@ export default {
       isShowPersonBtn: false,
       isShowSortBtn: false,
       caseId: '',
-      gridId: '',
+      deptId: '',
       personId: '',
       queryDisabled: ''
     }
@@ -158,7 +158,7 @@ export default {
     if (this.$route.query.gridId !== '' && this.$route.query.gridId != null) {
       // 展示示范网格跳转按钮
       this.isShowGridBtn = true
-      this.gridId = this.$route.query.gridId
+      this.deptId = this.$route.query.gridId
     }
     if (this.$route.query.personId !== '' && this.$route.query.personId != null) {
       // 展示身边榜样跳转按钮
@@ -177,7 +177,7 @@ export default {
     },
     goToGridHandle () {
       this.$parent.selectComponent = 'MonthexcellentgridDetail'
-      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: this.gridId, disabled: this.queryDisabled, infoId: this.dataForm.id } })
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: this.deptId, disabled: this.queryDisabled, infoId: this.dataForm.id } })
     },
     goToPersonHandle () {
       this.$parent.selectComponent = 'MonthexcellentpersonDetail'