From cba8a8d4d85a7f622452f6e0f02631118e13230e Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Sat, 21 Sep 2019 10:10:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E5=85=9A?=
 =?UTF-8?q?=E5=A7=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en-US.js                             |   1 +
 src/i18n/zh-CN.js                             |   1 +
 src/views/modules/events/issue-change.vue     | 167 +++++++++++------
 src/views/modules/events/issue-close.vue      | 167 +++++++++++------
 src/views/modules/events/issue-process.vue    | 176 +++++++++++-------
 src/views/modules/events/issue-reject.vue     | 142 ++++++++------
 src/views/modules/events/issue-review.vue     | 142 ++++++++------
 src/views/modules/events/item-close.vue       | 167 +++++++++++------
 src/views/modules/events/item-deal.vue        | 172 +++++++++++------
 src/views/modules/events/item-end.vue         | 157 ++++++++++------
 .../modules/news/banner-add-or-update.vue     |   2 +-
 src/views/modules/news/news-add-or-update.vue |   2 +-
 src/views/modules/news/news-publish.vue       |   2 +-
 src/views/modules/news/news.vue               |   2 +-
 src/views/modules/news/newsdraft.vue          |   2 +-
 .../modules/news/notice-add-or-update.vue     |   2 +-
 src/views/modules/sys/dept-add-or-update.vue  |   7 +-
 src/views/modules/sys/deptmacode.vue          |   2 +-
 .../user/partymembers-add-or-update.vue       |   2 +-
 src/views/modules/user/partymembers.vue       |   2 +-
 src/views/modules/user/user.vue               |   2 +-
 src/views/pages/login.vue                     |  19 +-
 22 files changed, 847 insertions(+), 491 deletions(-)

diff --git a/src/i18n/en-US.js b/src/i18n/en-US.js
index c4485d47..d7570548 100644
--- a/src/i18n/en-US.js
+++ b/src/i18n/en-US.js
@@ -270,6 +270,7 @@ t.oss.localPathTips = 'eg: D:/upload'
 
 t.dept = {}
 t.dept.name = 'Name'
+t.dept.partyCode = 'partyCode'
 t.dept.parentName = 'Superior'
 t.dept.sort = 'Sort'
 t.dept.parentNameDefault = 'Top Department'
diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index 30b2b945..9c31119e 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -275,6 +275,7 @@ t.oss.localPathTips = '如：D:/upload'
 
 t.dept = {}
 t.dept.name = '名称'
+t.dept.partyCode = '编码'
 t.dept.parentName = '上级部门'
 t.dept.sort = '排序'
 t.dept.parentNameDefault = '一级部门'
diff --git a/src/views/modules/events/issue-change.vue b/src/views/modules/events/issue-change.vue
index f86c4421..b2eda134 100644
--- a/src/views/modules/events/issue-change.vue
+++ b/src/views/modules/events/issue-change.vue
@@ -1,87 +1,132 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-demo__epdcevents}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
         <el-form-item label="街道">
-          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
-            <el-option
-              v-for="item in streetOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
-            <el-option
-              v-for="item in communityOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" placeholder="请选择">
-            <el-option
-              v-for="item in gridOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.gridId"
+                     placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="startTime">
-          <el-date-picker
-                  v-model="dataForm.startTime"
-                  type="date"
-                  :picker-options="pickerBeginDateBefore"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="至" label-width = "25px" prop="endTime">
-          <el-date-picker
-                  v-model="dataForm.endTime"
-                  type="date"
-                  :picker-options="pickerBeginDateAfter"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column label="序号" type="index" show-overflow-tooltip width="50" ></el-table-column>
-        <el-table-column prop="issueContent" label="议题内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="提交时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="participateNum" label="参与人数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="approveNum" label="支持人数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="opposeNum" label="反对人数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         width="50"></el-table-column>
+        <el-table-column prop="issueContent"
+                         label="议题内容"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="提交时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="nickName"
+                         label="提交人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="participateNum"
+                         label="参与人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="approveNum"
+                         label="支持人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="opposeNum"
+                         label="反对人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="commentNum"
+                         label="评论数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="browseNum"
+                         label="浏览数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('events:change:look')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
+            <el-button v-if="$hasPermission('events:change:look')"
+                       type="text"
+                       size="small"
+                       @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
       </el-pagination>
-      <detail v-if="detailVisible" ref="detail" @refreshDataList="getDataList"></detail>
+      <detail v-if="detailVisible"
+              ref="detail"
+              @refreshDataList="getDataList"></detail>
     </div>
   </el-card>
 </template>
@@ -142,12 +187,12 @@ export default {
       })
     },
     getStreetList () {
-      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
         this.streetOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getCommunityList () {
       this.dataForm.communityId = ''
@@ -157,7 +202,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.communityOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getGridList () {
       this.dataForm.gridId = ''
@@ -166,7 +211,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.gridOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     }
   }
 }
diff --git a/src/views/modules/events/issue-close.vue b/src/views/modules/events/issue-close.vue
index 7eaa6575..82f0c80c 100644
--- a/src/views/modules/events/issue-close.vue
+++ b/src/views/modules/events/issue-close.vue
@@ -1,88 +1,133 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-demo__epdcevents}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
         <el-form-item label="街道">
-          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
-            <el-option
-              v-for="item in streetOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
-            <el-option
-              v-for="item in communityOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" placeholder="请选择">
-            <el-option
-              v-for="item in gridOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.gridId"
+                     placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="startTime">
-          <el-date-picker
-                  v-model="dataForm.startTime"
-                  type="date"
-                  :picker-options="pickerBeginDateBefore"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="至" label-width = "25px" prop="endTime">
-          <el-date-picker
-                  v-model="dataForm.endTime"
-                  type="date"
-                  :picker-options="pickerBeginDateAfter"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column label="序号" type="index" show-overflow-tooltip width="50" ></el-table-column>
-        <el-table-column prop="issueContent" label="议题内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="提交时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="participateNum" label="参与人数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="approveNum" label="支持人数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="opposeNum" label="反对人数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         width="50"></el-table-column>
+        <el-table-column prop="issueContent"
+                         label="议题内容"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="提交时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="nickName"
+                         label="提交人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="participateNum"
+                         label="参与人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="approveNum"
+                         label="支持人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="opposeNum"
+                         label="反对人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="commentNum"
+                         label="评论数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="browseNum"
+                         label="浏览数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('events:close:look')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
+            <el-button v-if="$hasPermission('events:close:look')"
+                       type="text"
+                       size="small"
+                       @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗 -->
-      <detail v-if="detailVisible" ref="detail" @refreshDataList="getDataList"></detail>
+      <detail v-if="detailVisible"
+              ref="detail"
+              @refreshDataList="getDataList"></detail>
     </div>
   </el-card>
 </template>
@@ -143,12 +188,12 @@ export default {
       })
     },
     getStreetList () {
-      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
         this.streetOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getCommunityList () {
       this.dataForm.communityId = ''
@@ -158,7 +203,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.communityOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getGridList () {
       this.dataForm.gridId = ''
@@ -167,7 +212,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.gridOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     }
   }
 }
diff --git a/src/views/modules/events/issue-process.vue b/src/views/modules/events/issue-process.vue
index 23a7dcb8..feb95ea1 100644
--- a/src/views/modules/events/issue-process.vue
+++ b/src/views/modules/events/issue-process.vue
@@ -1,90 +1,140 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-demo__epdcevents}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
         <el-form-item label="街道">
-          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
-            <el-option
-              v-for="item in streetOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
-            <el-option
-              v-for="item in communityOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" placeholder="请选择">
-            <el-option
-              v-for="item in gridOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.gridId"
+                     placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="startTime">
-          <el-date-picker
-                  v-model="dataForm.startTime"
-                  type="date"
-                  :picker-options="pickerBeginDateBefore"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="至" label-width = "25px" prop="endTime">
-          <el-date-picker
-                  v-model="dataForm.endTime"
-                  type="date"
-                  :picker-options="pickerBeginDateAfter"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column label="序号" type="index" show-overflow-tooltip width="50" ></el-table-column>
-        <el-table-column prop="issueContent" label="议题内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="提交时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="participateNum" label="参与人数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="approveNum" label="支持人数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="opposeNum" label="反对人数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         width="50"></el-table-column>
+        <el-table-column prop="issueContent"
+                         label="议题内容"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="提交时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="nickName"
+                         label="提交人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="participateNum"
+                         label="参与人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="approveNum"
+                         label="支持人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="opposeNum"
+                         label="反对人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="commentNum"
+                         label="评论数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="browseNum"
+                         label="浏览数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('events:issue:look')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
-            <el-button v-if="$hasPermission('events:issue:deal')" type="text" size="small" @click="dealAction(scope.row.id)">{{ $t('deal') }}</el-button>
+            <el-button v-if="$hasPermission('events:issue:look')"
+                       type="text"
+                       size="small"
+                       @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
+            <el-button v-if="$hasPermission('events:issue:deal')"
+                       type="text"
+                       size="small"
+                       @click="dealAction(scope.row.id)">{{ $t('deal') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <process-deal v-if="processDealVisible" ref="processDeal" @refreshDataList="getDataList"></process-deal>
-      <detail v-if="detailVisible" ref="detail" @refreshDataList="getDataList"></detail>
+      <process-deal v-if="processDealVisible"
+                    ref="processDeal"
+                    @refreshDataList="getDataList"></process-deal>
+      <detail v-if="detailVisible"
+              ref="detail"
+              @refreshDataList="getDataList"></detail>
     </div>
   </el-card>
 </template>
@@ -155,12 +205,12 @@ export default {
       })
     },
     getStreetList () {
-      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
         this.streetOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getCommunityList () {
       this.dataForm.communityId = ''
@@ -170,7 +220,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.communityOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getGridList () {
       this.dataForm.gridId = ''
@@ -179,7 +229,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.gridOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     }
   }
 }
diff --git a/src/views/modules/events/issue-reject.vue b/src/views/modules/events/issue-reject.vue
index 8de2a904..c96e1020 100644
--- a/src/views/modules/events/issue-reject.vue
+++ b/src/views/modules/events/issue-reject.vue
@@ -1,83 +1,113 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-demo__epdcevents}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
         <el-form-item label="街道">
-          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
-            <el-option
-              v-for="item in streetOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
-            <el-option
-              v-for="item in communityOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" placeholder="请选择">
-            <el-option
-              v-for="item in gridOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.gridId"
+                     placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="startTime">
-          <el-date-picker
-                  v-model="dataForm.startTime"
-                  type="date"
-                  :picker-options="pickerBeginDateBefore"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="至" label-width = "25px" prop="endTime">
-          <el-date-picker
-                  v-model="dataForm.endTime"
-                  type="date"
-                  :picker-options="pickerBeginDateAfter"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column label="序号" type="index" show-overflow-tooltip width="50" ></el-table-column>
-        <el-table-column prop="eventContent" label="议题内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="提交时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         width="50"></el-table-column>
+        <el-table-column prop="eventContent"
+                         label="议题内容"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="提交时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="nickName"
+                         label="提交人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('events:reject:look')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
+            <el-button v-if="$hasPermission('events:reject:look')"
+                       type="text"
+                       size="small"
+                       @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <reject-detail v-if="rejectDetailVisible" ref="rejectDetail" @refreshDataList="getDataList"></reject-detail>
+      <reject-detail v-if="rejectDetailVisible"
+                     ref="rejectDetail"
+                     @refreshDataList="getDataList"></reject-detail>
     </div>
   </el-card>
 </template>
@@ -139,12 +169,12 @@ export default {
       })
     },
     getStreetList () {
-      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
         this.streetOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getCommunityList () {
       this.dataForm.communityId = ''
@@ -154,7 +184,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.communityOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getGridList () {
       this.dataForm.gridId = ''
@@ -163,7 +193,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.gridOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     }
   }
 }
diff --git a/src/views/modules/events/issue-review.vue b/src/views/modules/events/issue-review.vue
index da4f07ee..89fa9889 100644
--- a/src/views/modules/events/issue-review.vue
+++ b/src/views/modules/events/issue-review.vue
@@ -1,83 +1,113 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-demo__epdcevents}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
         <el-form-item label="街道">
-          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
-            <el-option
-              v-for="item in streetOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
-            <el-option
-              v-for="item in communityOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" placeholder="请选择">
-            <el-option
-              v-for="item in gridOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.gridId"
+                     placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="startTime">
-          <el-date-picker
-                  v-model="dataForm.startTime"
-                  type="date"
-                  :picker-options="pickerBeginDateBefore"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="至" label-width = "25px" prop="endTime">
-          <el-date-picker
-                  v-model="dataForm.endTime"
-                  type="date"
-                  :picker-options="pickerBeginDateAfter"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column label="序号" type="index" show-overflow-tooltip width="50" ></el-table-column>
-        <el-table-column prop="eventContent" label="议题内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="提交时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         width="50"></el-table-column>
+        <el-table-column prop="eventContent"
+                         label="议题内容"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="提交时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="nickName"
+                         label="提交人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('events:epdcevents:verify')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('verify') }}</el-button>
+            <el-button v-if="$hasPermission('events:epdcevents:verify')"
+                       type="text"
+                       size="small"
+                       @click="detailAction(scope.row.id)">{{ $t('verify') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <review-detail v-if="reviewDetailVisible" ref="reviewDetail" @refreshDataList="getDataList"></review-detail>
+      <review-detail v-if="reviewDetailVisible"
+                     ref="reviewDetail"
+                     @refreshDataList="getDataList"></review-detail>
     </div>
   </el-card>
 </template>
@@ -139,12 +169,12 @@ export default {
       })
     },
     getStreetList () {
-      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
         this.streetOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getCommunityList () {
       this.dataForm.communityId = ''
@@ -154,7 +184,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.communityOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getGridList () {
       this.dataForm.gridId = ''
@@ -163,7 +193,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.gridOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     }
   }
 }
diff --git a/src/views/modules/events/item-close.vue b/src/views/modules/events/item-close.vue
index b6041045..8d6d0b0e 100755
--- a/src/views/modules/events/item-close.vue
+++ b/src/views/modules/events/item-close.vue
@@ -1,87 +1,132 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-item__item}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
         <el-form-item label="街道">
-          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
-            <el-option
-              v-for="item in streetOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
-            <el-option
-              v-for="item in communityOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" placeholder="请选择">
-            <el-option
-              v-for="item in gridOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.gridId"
+                     placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="startTime">
-          <el-date-picker
-                  v-model="dataForm.startTime"
-                  type="date"
-                  :picker-options="pickerBeginDateBefore"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="至" label-width = "25px" prop="endTime">
-          <el-date-picker
-                  v-model="dataForm.endTime"
-                  type="date"
-                  :picker-options="pickerBeginDateAfter"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="itemContent" label="项目内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="转成项目时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="participantsNum" label="参与人数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="approveNum" label="支持" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="opposeNum" label="反对" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="itemContent"
+                         label="项目内容"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="转成项目时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="nickName"
+                         label="提交人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="participantsNum"
+                         label="参与人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="approveNum"
+                         label="支持"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="opposeNum"
+                         label="反对"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="commentNum"
+                         label="评论数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="browseNum"
+                         label="浏览数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('events:item:look')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
+            <el-button v-if="$hasPermission('events:item:look')"
+                       type="text"
+                       size="small"
+                       @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
       </el-pagination>
-      <detail v-if="detailVisible" ref="detailRef" @refreshDataList="getDataList"></detail>
+      <detail v-if="detailVisible"
+              ref="detailRef"
+              @refreshDataList="getDataList"></detail>
     </div>
   </el-card>
 </template>
@@ -143,12 +188,12 @@ export default {
       })
     },
     getStreetList () {
-      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
         this.streetOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getCommunityList () {
       this.dataForm.communityId = ''
@@ -158,7 +203,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.communityOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getGridList () {
       this.dataForm.gridId = ''
@@ -167,7 +212,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.gridOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     }
   }
 }
diff --git a/src/views/modules/events/item-deal.vue b/src/views/modules/events/item-deal.vue
index 27c7685d..06dfcd33 100755
--- a/src/views/modules/events/item-deal.vue
+++ b/src/views/modules/events/item-deal.vue
@@ -1,89 +1,137 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-item__item}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
         <el-form-item label="街道">
-          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
-            <el-option
-              v-for="item in streetOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
-            <el-option
-              v-for="item in communityOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" placeholder="请选择">
-            <el-option
-              v-for="item in gridOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.gridId"
+                     placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="startTime">
-          <el-date-picker
-                  v-model="dataForm.startTime"
-                  type="date"
-                  :picker-options="pickerBeginDateBefore"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="至" label-width = "25px" prop="endTime">
-          <el-date-picker
-                  v-model="dataForm.endTime"
-                  type="date"
-                  :picker-options="pickerBeginDateAfter"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column label="序号" type="index" show-overflow-tooltip width="50" ></el-table-column>
-        <el-table-column prop="itemContent" label="项目内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="转成项目时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="participantsNum" label="参与人数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="approveNum" label="支持" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="opposeNum" label="反对" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         width="50"></el-table-column>
+        <el-table-column prop="itemContent"
+                         label="项目内容"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="转成项目时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="nickName"
+                         label="提交人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="participantsNum"
+                         label="参与人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="approveNum"
+                         label="支持"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="opposeNum"
+                         label="反对"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="commentNum"
+                         label="评论数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="browseNum"
+                         label="浏览数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('events:item:deal')" type="text" size="small" @click="dealAction(scope.row.id)">{{ $t('deal') }}</el-button>
+            <el-button v-if="$hasPermission('events:item:deal')"
+                       type="text"
+                       size="small"
+                       @click="dealAction(scope.row.id)">{{ $t('deal') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <detail v-if="detailVisible" ref="detail" @refreshDataList="getDataList"></detail>
+      <detail v-if="detailVisible"
+              ref="detail"
+              @refreshDataList="getDataList"></detail>
     </div>
   </el-card>
 </template>
@@ -145,12 +193,12 @@ export default {
       })
     },
     getStreetList () {
-      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
         this.streetOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getCommunityList () {
       this.dataForm.communityId = ''
@@ -160,7 +208,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.communityOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getGridList () {
       this.dataForm.gridId = ''
@@ -169,7 +217,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.gridOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     }
   }
 }
diff --git a/src/views/modules/events/item-end.vue b/src/views/modules/events/item-end.vue
index cdcd5825..b434ff49 100755
--- a/src/views/modules/events/item-end.vue
+++ b/src/views/modules/events/item-end.vue
@@ -1,81 +1,120 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-item__item}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
         <el-form-item label="街道">
-          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
-            <el-option
-              v-for="item in streetOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
-            <el-option
-              v-for="item in communityOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" placeholder="请选择">
-            <el-option
-              v-for="item in gridOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+          <el-select v-model="dataForm.gridId"
+                     placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="startTime">
-          <el-date-picker
-                  v-model="dataForm.startTime"
-                  type="date"
-                  :picker-options="pickerBeginDateBefore"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="至" label-width = "25px" prop="endTime">
-          <el-date-picker
-                  v-model="dataForm.endTime"
-                  type="date"
-                  :picker-options="pickerBeginDateAfter"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd"
-                  placeholder="选择日期时间">
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="itemContent" label="项目内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="转成项目时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="participantsNum" label="参与人数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="approveNum" label="支持" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="opposeNum" label="反对" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="evaluationScore" label="评价" header-align="center" align="center"></el-table-column>
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="itemContent"
+                         label="项目内容"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="转成项目时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="nickName"
+                         label="提交人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="participantsNum"
+                         label="参与人数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="approveNum"
+                         label="支持"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="opposeNum"
+                         label="反对"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="commentNum"
+                         label="评论数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="browseNum"
+                         label="浏览数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="evaluationScore"
+                         label="评价"
+                         header-align="center"
+                         align="center"></el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
       </el-pagination>
     </div>
   </el-card>
@@ -128,12 +167,12 @@ export default {
   },
   methods: {
     getStreetList () {
-      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
         this.streetOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getCommunityList () {
       this.dataForm.communityId = ''
@@ -143,7 +182,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.communityOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getGridList () {
       this.dataForm.gridId = ''
@@ -152,7 +191,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.gridOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     }
   }
 }
diff --git a/src/views/modules/news/banner-add-or-update.vue b/src/views/modules/news/banner-add-or-update.vue
index 1899af92..8c6e0b93 100644
--- a/src/views/modules/news/banner-add-or-update.vue
+++ b/src/views/modules/news/banner-add-or-update.vue
@@ -151,7 +151,7 @@ export default {
   },
   created () {
     // 1169154711480528897 为市北区部门ID
-    this.getDeptInfoList('street', '1169154711480528897')
+    this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
     this.getListFromDict('bannerType')
     this.getListFromDict('bannerPosition')
   },
diff --git a/src/views/modules/news/news-add-or-update.vue b/src/views/modules/news/news-add-or-update.vue
index 89a6bb3a..226d5615 100644
--- a/src/views/modules/news/news-add-or-update.vue
+++ b/src/views/modules/news/news-add-or-update.vue
@@ -176,7 +176,7 @@ export default {
     }
   },
   created () {
-    this.getDeptInfoList('street', '1169154711480528897')
+    this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
     this.getListCategory()
     this.visible = true
     this.$nextTick(() => {
diff --git a/src/views/modules/news/news-publish.vue b/src/views/modules/news/news-publish.vue
index 2f12d25f..c2981f1f 100644
--- a/src/views/modules/news/news-publish.vue
+++ b/src/views/modules/news/news-publish.vue
@@ -182,7 +182,7 @@ export default {
     }
   },
   created () {
-    this.getDeptInfoList('street', '1169154711480528897')
+    this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
     this.getListCategory()
     this.visible = true
     this.$nextTick(() => {
diff --git a/src/views/modules/news/news.vue b/src/views/modules/news/news.vue
index d69d99d0..19a53749 100644
--- a/src/views/modules/news/news.vue
+++ b/src/views/modules/news/news.vue
@@ -208,7 +208,7 @@ export default {
     }
   },
   created () {
-    this.getDeptInfoList('street', '1169154711480528897')
+    this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
     this.getListCategory()
   },
   methods: {
diff --git a/src/views/modules/news/newsdraft.vue b/src/views/modules/news/newsdraft.vue
index 7832c10f..acfb9c90 100644
--- a/src/views/modules/news/newsdraft.vue
+++ b/src/views/modules/news/newsdraft.vue
@@ -187,7 +187,7 @@ export default {
     }
   },
   created () {
-    this.getDeptInfoList('street', '1169154711480528897')
+    this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
     this.getListCategory()
   },
   methods: {
diff --git a/src/views/modules/news/notice-add-or-update.vue b/src/views/modules/news/notice-add-or-update.vue
index 7f0f5609..0c9e38a4 100644
--- a/src/views/modules/news/notice-add-or-update.vue
+++ b/src/views/modules/news/notice-add-or-update.vue
@@ -136,7 +136,7 @@ export default {
   },
   created () {
     // 1169154711480528897 为市北区部门ID
-    this.getDeptInfoList('street', '1169154711480528897')
+    this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
   },
   methods: {
     // 富文本编辑器
diff --git a/src/views/modules/sys/dept-add-or-update.vue b/src/views/modules/sys/dept-add-or-update.vue
index ee9ba118..0b52867c 100644
--- a/src/views/modules/sys/dept-add-or-update.vue
+++ b/src/views/modules/sys/dept-add-or-update.vue
@@ -13,6 +13,10 @@
         <el-input v-model="dataForm.name"
                   :placeholder="$t('dept.name')"></el-input>
       </el-form-item>
+      <el-form-item :label="$t('dept.partyCode')">
+        <el-input v-model="dataForm.partyCode"
+                  :placeholder="$t('dept.partyCode')"></el-input>
+      </el-form-item>
       <el-form-item prop="parentName"
                     :label="$t('dept.parentName')"
                     class="dept-list">
@@ -84,7 +88,8 @@ export default {
         parentName: '',
         sort: 0,
         typeKey: '',
-        typeName: ''
+        typeName: '',
+        partyCode: ''
       },
       secondOrgDictList: []
     }
diff --git a/src/views/modules/sys/deptmacode.vue b/src/views/modules/sys/deptmacode.vue
index 65d02e4f..786e8e42 100644
--- a/src/views/modules/sys/deptmacode.vue
+++ b/src/views/modules/sys/deptmacode.vue
@@ -142,7 +142,7 @@ export default {
   components: {
   },
   created () {
-    this.getDeptInfoList('street', '1169154711480528897')
+    this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
   },
   methods: {
     createDeptMaCodeHandle (id) {
diff --git a/src/views/modules/user/partymembers-add-or-update.vue b/src/views/modules/user/partymembers-add-or-update.vue
index 8d6f882a..abbad9ea 100755
--- a/src/views/modules/user/partymembers-add-or-update.vue
+++ b/src/views/modules/user/partymembers-add-or-update.vue
@@ -165,7 +165,7 @@ export default {
       }).catch(() => { })
     },
     getStreetList () {
-      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/views/modules/user/partymembers.vue b/src/views/modules/user/partymembers.vue
index bd635cf0..44bd00d7 100755
--- a/src/views/modules/user/partymembers.vue
+++ b/src/views/modules/user/partymembers.vue
@@ -240,7 +240,7 @@ export default {
       this.dataForm.endTime = this.timeRange[1]
     },
     getStreetList () {
-      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue
index 39d98ba5..cbd08a9a 100644
--- a/src/views/modules/user/user.vue
+++ b/src/views/modules/user/user.vue
@@ -418,7 +418,7 @@ export default {
   },
   methods: {
     getStreetList () {
-      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index 63658266..747914f7 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -135,9 +135,26 @@ export default {
           }
           Cookies.set('token', res.data.token)
           this.$router.replace({ name: 'home' })
+          // 登陆之后从localStorage获取党委为空则从网络上拉取
+          this.checkLocakStorage()
         }).catch(() => { })
       })
-    }, 1000, { 'leading': true, 'trailing': false })
+    }, 1000, { 'leading': true, 'trailing': false }),
+    checkLocakStorage () {
+      var street = localStorage.getItem('street')
+      if (street === null) {
+        this.getIdByCode('shibei')
+      }
+    },
+    // 获取党委
+    getIdByCode (partyCode) {
+      this.$http.get(`/sys/dept/getIdByCode/` + partyCode).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        localStorage.setItem('street', res.data.id)
+      }).catch(() => { })
+    }
   }
 }
 </script>