diff --git a/public/index.html b/public/index.html
index e5bc4555..e6c105ff 100644
--- a/public/index.html
+++ b/public/index.html
@@ -35,7 +35,8 @@
   <!-- 开发环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
   <script>
-    window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
+    // window.SITE_CONFIG['apiURL'] = 'localhost:9094/epdc-api'
+    window.SITE_CONFIG['apiURL'] = 'https://epdc-shibei.elinkservice.cn/epdc-api'
   </script>
   <% } %>
   <!-- 集成测试环境 -->
diff --git a/src/views/modules/analysis/issue/hottest-issue-list.vue b/src/views/modules/analysis/issue/hottest-issue-list.vue
index ba0e9590..81f51bc6 100644
--- a/src/views/modules/analysis/issue/hottest-issue-list.vue
+++ b/src/views/modules/analysis/issue/hottest-issue-list.vue
@@ -7,7 +7,7 @@
           </el-cascader>
         </el-form-item>
         <el-form-item label="议题摘要" prop="topicContent">
-          <el-input v-model="dataForm.issueContent" placeholder="议题摘要" clearable ></el-input>
+          <el-input v-model="dataForm.issueContent" placeholder="议题摘要" clearable @keyup.native="btKeyUpissueContent" ></el-input>
         </el-form-item>
         <br>
         <el-form-item label="时间"
@@ -148,6 +148,10 @@ export default {
     detailAction (id) {
       this.$parent.selectComponent = 'IssueDetailView'
       this.$router.push({ path: '/analysis-issue-hottest-issue', query: { id: id } })
+    },
+    btKeyUpissueContent(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.issueContent = e.target.value
     }
   }
 }
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 26f01bdc..76ae87be 100644
--- a/src/views/modules/analysis/issue/issue-classified-statistic-second.vue
+++ b/src/views/modules/analysis/issue/issue-classified-statistic-second.vue
@@ -4,7 +4,7 @@
     :title="title"
     :close-on-click-modal="false"
     :close-on-press-escape="false">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item label="所属机构">
           <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
@@ -21,7 +21,7 @@
         </el-form-item>
         <div class="block">
         <el-form-item label="时间"
-                      prop="startTime">
+                      prop="startTime" label-width="70px">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore"
@@ -42,7 +42,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         </div>
       </el-form>
diff --git a/src/views/modules/analysis/issue/issue-classified-statistic.vue b/src/views/modules/analysis/issue/issue-classified-statistic.vue
index f98a7d07..15e3fed6 100644
--- a/src/views/modules/analysis/issue/issue-classified-statistic.vue
+++ b/src/views/modules/analysis/issue/issue-classified-statistic.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__topic}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item label="所属机构">
           <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
@@ -27,7 +27,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="时间"
-                      prop="startTime">
+                      prop="startTime" label-width="70px">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore"
@@ -48,7 +48,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/src/views/modules/analysis/issue/latest-issue-list.vue b/src/views/modules/analysis/issue/latest-issue-list.vue
index bea9bd65..2d62f089 100644
--- a/src/views/modules/analysis/issue/latest-issue-list.vue
+++ b/src/views/modules/analysis/issue/latest-issue-list.vue
@@ -7,7 +7,7 @@
           </el-cascader>
         </el-form-item>
         <el-form-item label="议题摘要" prop="topicContent">
-          <el-input v-model="dataForm.issueContent" placeholder="议题摘要" clearable ></el-input>
+          <el-input v-model="dataForm.issueContent" placeholder="议题摘要" clearable @keyup.native="btKeyUpissueContent" ></el-input>
         </el-form-item>
         <br>
         <el-form-item label="时间"
@@ -147,6 +147,10 @@ export default {
     detailAction (id) {
       this.$parent.selectComponent = 'IssueDetailView'
       this.$router.push({ path: '/analysis-issue-latest-issue', query: { id: id } })
+    },
+    btKeyUpissueContent(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.issueContent = e.target.value
     }
   }
 }
diff --git a/src/views/modules/analysis/item/difficult-Item-list.vue b/src/views/modules/analysis/item/difficult-Item-list.vue
index 8b82102f..9177aca3 100644
--- a/src/views/modules/analysis/item/difficult-Item-list.vue
+++ b/src/views/modules/analysis/item/difficult-Item-list.vue
@@ -16,7 +16,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="项目状态">
+        <el-form-item label="项目状态" label-width="135px">
           <el-select v-model="dataForm.itemState" placeholder="全部" clearable >
             <el-option
               v-for="item in itemStateOptions"
@@ -48,7 +48,7 @@
                           placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="满意度" label-width="100px">
+        <el-form-item label="满意度" label-width="140px" >
           <el-select v-model="dataForm.evaluationScore" placeholder="全部" clearable >
             <el-option
               v-for="item in evaluationScoreOptions"
diff --git a/src/views/modules/analysis/item/hottest-item-list.vue b/src/views/modules/analysis/item/hottest-item-list.vue
index 57a76184..bbf45c98 100644
--- a/src/views/modules/analysis/item/hottest-item-list.vue
+++ b/src/views/modules/analysis/item/hottest-item-list.vue
@@ -7,7 +7,7 @@
           </el-cascader>
         </el-form-item>
         <el-form-item label="项目摘要" prop="topicContent">
-          <el-input v-model="dataForm.searchContent" placeholder="请输入关键字模糊搜索" clearable ></el-input>
+          <el-input v-model="dataForm.searchContent" placeholder="请输入关键字模糊搜索" clearable @keyup.native="btKeyUpsearchContent" ></el-input>
         </el-form-item>
         <br>
         <el-form-item label="时间"
@@ -147,6 +147,10 @@ export default {
     look (id) {
       this.$parent.selectComponent = 'ItemDetailView'
       this.$router.push({ path: '/analysis-item-hottest-item', query: { id: id } })
+    },
+    btKeyUpsearchContent(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.searchContent = e.target.value
     }
   }
 }
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 c2a9e91c..d5375012 100644
--- a/src/views/modules/analysis/item/report-solved-item-list.vue
+++ b/src/views/modules/analysis/item/report-solved-item-list.vue
@@ -9,7 +9,7 @@
           <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable></el-cascader>
         </el-form-item>
         <el-form-item label="项目摘要" prop="topicContent">
-          <el-input v-model="dataForm.searchContent" placeholder="项目摘要" clearable ></el-input>
+          <el-input v-model="dataForm.searchContent" placeholder="项目摘要" clearable @keyup.native="btKeyUpsearchContent"></el-input>
         </el-form-item>
         <div class="block">
         <el-form-item label="上报网格化平台时间"
@@ -210,7 +210,11 @@ export default {
     look (id) {
       this.$parent.selectComponent = 'ItemDetailView'
       this.$router.push({ path: '/analysis-item-report-solved-item', query: { id: id } })
-    }
+    },
+    btKeyUpsearchContent(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.searchContent = e.target.value
+    },
   }
 }
 </script>
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 474e1c87..1bc3da17 100644
--- a/src/views/modules/analysis/item/report-unsolved-item-list.vue
+++ b/src/views/modules/analysis/item/report-unsolved-item-list.vue
@@ -9,7 +9,7 @@
           <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable></el-cascader>
         </el-form-item>
         <el-form-item label="项目摘要" prop="topicContent">
-          <el-input v-model="dataForm.searchContent" placeholder="项目摘要" clearable ></el-input>
+          <el-input v-model="dataForm.searchContent" placeholder="项目摘要" clearable @keyup.native="btKeyUpsearchContent"></el-input>
         </el-form-item>
         <div class="block">
         <el-form-item label="上报网格化平台时间"
@@ -167,7 +167,11 @@ export default {
     look (id) {
       this.$parent.selectComponent = 'ItemDetailView'
       this.$router.push({ path: '/analysis-item-report-unsolved-item', query: { id: id } })
-    }
+    },
+    btKeyUpsearchContent(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.searchContent = e.target.value
+    },
   }
 }
 </script>
diff --git a/src/views/modules/analysis/item/unsolved-item-list.vue b/src/views/modules/analysis/item/unsolved-item-list.vue
index 571c4ad3..e50d669b 100644
--- a/src/views/modules/analysis/item/unsolved-item-list.vue
+++ b/src/views/modules/analysis/item/unsolved-item-list.vue
@@ -7,7 +7,7 @@
           </el-cascader>
         </el-form-item>
         <el-form-item label="项目摘要" prop="topicContent">
-          <el-input v-model="dataForm.searchContent" placeholder="项目摘要" clearable ></el-input>
+          <el-input v-model="dataForm.searchContent" placeholder="项目摘要" clearable @keyup.native="btKeyUpsearchContent" ></el-input>
         </el-form-item>
         <br>
         <el-form-item label="转项目时间"
@@ -145,7 +145,11 @@ export default {
     look (id) {
       this.$parent.selectComponent = 'ItemDetailView'
       this.$router.push({ path: '/analysis-item-unsolved-item', query: { id: id } })
-    }
+    },
+    btKeyUpsearchContent(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.searchContent = e.target.value
+    },
   }
 }
 </script>
diff --git a/src/views/modules/analysis/topic/hottest-topic-list.vue b/src/views/modules/analysis/topic/hottest-topic-list.vue
index 9ec39727..7857c426 100644
--- a/src/views/modules/analysis/topic/hottest-topic-list.vue
+++ b/src/views/modules/analysis/topic/hottest-topic-list.vue
@@ -7,7 +7,7 @@
           </el-cascader>
         </el-form-item>
         <el-form-item label="话题摘要" prop="topicContent">
-          <el-input v-model="dataForm.topicContent" placeholder="话题摘要" clearable ></el-input>
+          <el-input v-model="dataForm.topicContent" placeholder="话题摘要" clearable @keyup.native="btKeyUptopicContent" ></el-input>
         </el-form-item>
         <br>
         <el-form-item label="时间"
@@ -148,7 +148,11 @@ export default {
     look (id) {
       this.$parent.selectComponent = 'TopicDetail'
       this.$router.push({ path: '/analysis-topic-hottest-topic', query: { id: id } })
-    }
+    },
+    btKeyUptopicContent(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.topicContent = e.target.value
+    },
   }
 }
 </script>
diff --git a/src/views/modules/analysis/topic/latest-topic-list.vue b/src/views/modules/analysis/topic/latest-topic-list.vue
index 3d297fa7..38788cee 100644
--- a/src/views/modules/analysis/topic/latest-topic-list.vue
+++ b/src/views/modules/analysis/topic/latest-topic-list.vue
@@ -7,7 +7,7 @@
           </el-cascader>
         </el-form-item>
         <el-form-item label="话题摘要" prop="topicContent">
-          <el-input v-model="dataForm.topicContent" placeholder="话题摘要" clearable ></el-input>
+          <el-input v-model="dataForm.topicContent" placeholder="话题摘要" clearable @keyup.native="btKeyUptopicContent" ></el-input>
         </el-form-item>
         <br>
         <el-form-item label="时间"
@@ -146,6 +146,10 @@ export default {
     look (id) {
       this.$parent.selectComponent = 'TopicDetail'
       this.$router.push({ path: '/analysis-topic-latest-topic', query: { id: id } })
+    },
+    btKeyUptopicContent(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.topicContent = e.target.value
     }
   }
 }
diff --git a/src/views/modules/custom/enterpriseinfo.vue b/src/views/modules/custom/enterpriseinfo.vue
index dbd908a2..a01c5329 100755
--- a/src/views/modules/custom/enterpriseinfo.vue
+++ b/src/views/modules/custom/enterpriseinfo.vue
@@ -1,129 +1,170 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-__enterpriseinfo}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
-        <div>
-          <el-form-item label="区域" label-width="52px">
-            <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable>
-            </el-cascader>
-          </el-form-item>
-          <el-form-item label="公司名称"><el-input v-model="dataForm.enterpriseName" placeholder="请输入" clearable></el-input></el-form-item>
-          <el-form-item label="统一社会信用代码"><el-input v-model="dataForm.uniformSocialCreditCode" placeholder="请输入" clearable></el-input></el-form-item>
-        </div>
-        <el-form-item label="手机号"><el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input></el-form-item>
-        <el-form-item label="法人姓名"><el-input v-model="dataForm.legalPerson" placeholder="请输入" clearable></el-input></el-form-item>
+    <el-card shadow="never" class="aui-card--fill">
+        <div class="mod-__enterpriseinfo}">
+            <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+                <div>
+                    <el-form-item label="区域" label-width="52px">
+                        <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable>
+                        </el-cascader>
+                    </el-form-item>
+                    <el-form-item label="公司名称">
+                        <el-input v-model="dataForm.enterpriseName" placeholder="请输入" clearable @keyup.native="btKeyUpenterpriseName"></el-input>
+                    </el-form-item>
+                    <el-form-item label="统一社会信用代码">
+                        <el-input v-model="dataForm.uniformSocialCreditCode" placeholder="请输入" clearable @keyup.native="btKeyUpuniformSocialCreditCode"></el-input>
+                    </el-form-item>
+                </div>
+                <el-form-item label="手机号">
+                    <el-input v-model="dataForm.mobile" placeholder="请输入" clearable @keyup.native="btKeyUpmobile"></el-input>
+                </el-form-item>
+                <el-form-item label="法人姓名">
+                    <el-input v-model="dataForm.legalPerson" placeholder="请输入" clearable @keyup.native="btKeyUplegalPerson"></el-input>
+                </el-form-item>
 
-        <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('epdc:enterpriseinfo:export')" type="success" @click="exportHandle()">{{ $t('export') }}</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="序号" header-align="center" align="center" width="50px">
-            <template slot-scope="scope">
-                {{scope.$index+1}}
-            </template>
-        </el-table-column>
-        <el-table-column prop="realName" label="姓名" header-align="center" align="center" width="120"></el-table-column>
-        <el-table-column prop="sex" label="性别" header-align="center" align="center" :formatter="showFlagFormat" width="80"></el-table-column>
-        <el-table-column prop="mobile" label="手机号" header-align="center" align="center" width="150"></el-table-column>
-        <el-table-column prop="enterpriseName" label="企业全称" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="uniformSocialCreditCode" label="统一社会信用代码" header-align="center" align="center" min-width="180" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="legalPerson" label="企业法人" header-align="center" align="center" width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="enterpriseAddress" label="企业地址" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="industry" label="所属行业" header-align="center" align="center" min-width="180" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="businessScope" label="经营范围" header-align="center" align="center" min-width="180" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="registeredCapital" label="注册资金(万元)" header-align="center" align="center" width="120"></el-table-column>
-        <el-table-column prop="employedPopulation" label="从业人数" header-align="center" align="center" width="120"></el-table-column>
-        <el-table-column prop="allDeptNames" label="所属网格" header-align="center" align="center" min-width="400" show-overflow-tooltip></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>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
+                <el-form-item>
+                    <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+                </el-form-item>
+                <el-form-item>
+                    <el-button v-if="$hasPermission('epdc:enterpriseinfo:export')" type="success"
+                               @click="exportHandle()">{{ $t('export') }}
+                    </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="序号" header-align="center" align="center" width="50px">
+                    <template slot-scope="scope">
+                        {{scope.$index+1}}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="realName" label="姓名" header-align="center" align="center"
+                                 width="120"></el-table-column>
+                <el-table-column prop="sex" label="性别" header-align="center" align="center" :formatter="showFlagFormat"
+                                 width="80"></el-table-column>
+                <el-table-column prop="mobile" label="手机号" header-align="center" align="center"
+                                 width="150"></el-table-column>
+                <el-table-column prop="enterpriseName" label="企业全称" header-align="center" align="center" min-width="200"
+                                 show-overflow-tooltip></el-table-column>
+                <el-table-column prop="uniformSocialCreditCode" label="统一社会信用代码" header-align="center" align="center"
+                                 min-width="180" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="legalPerson" label="企业法人" header-align="center" align="center" width="120"
+                                 show-overflow-tooltip></el-table-column>
+                <el-table-column prop="enterpriseAddress" label="企业地址" header-align="center" align="center"
+                                 min-width="200" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="industry" label="所属行业" header-align="center" align="center" min-width="180"
+                                 show-overflow-tooltip></el-table-column>
+                <el-table-column prop="businessScope" label="经营范围" header-align="center" align="center" min-width="180"
+                                 show-overflow-tooltip></el-table-column>
+                <el-table-column prop="registeredCapital" label="注册资金(万元)" header-align="center" align="center"
+                                 width="120"></el-table-column>
+                <el-table-column prop="employedPopulation" label="从业人数" header-align="center" align="center"
+                                 width="120"></el-table-column>
+                <el-table-column prop="allDeptNames" label="所属网格" header-align="center" align="center" min-width="400"
+                                 show-overflow-tooltip></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>
+            <!-- 弹窗, 新增 / 修改 -->
+            <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+        </div>
+    </el-card>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './enterpriseinfo-add-or-update'
-export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/custom/enterpriseinfo/page',
-        getDataListIsPage: true,
-        deleteURL: '/custom/enterpriseinfo',
-        deleteIsBatch: true,
-        exportURL: '/custom/enterpriseinfo/export'
-      },
-      dataForm: {
-        enterpriseName: '',
-        mobile: '',
-        uniformSocialCreditCode: '',
-        legalPerson: ''
-      },
-      ids: [],
-      options: []
-    }
-  },
-  components: {
-    AddOrUpdate
-  },
-  created: function () {
-    this.getOptions()
-  },
-  watch: {
-    'ids': function (val) {
-      if (val.length === 0) {
-        this.dataForm.streetId = ''
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 1) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 2) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 3) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
-      }
-    }
-  },
-  methods: {
-    getOptions () {
-      this.$http.get(`/sys/dept/party/getDeptTreeForEpiDemic`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
+    import mixinViewModule from '@/mixins/view-module'
+    import AddOrUpdate from './enterpriseinfo-add-or-update'
+
+    export default {
+        mixins: [mixinViewModule],
+        data() {
+            return {
+                mixinViewModuleOptions: {
+                    getDataListURL: '/custom/enterpriseinfo/page',
+                    getDataListIsPage: true,
+                    deleteURL: '/custom/enterpriseinfo',
+                    deleteIsBatch: true,
+                    exportURL: '/custom/enterpriseinfo/export'
+                },
+                dataForm: {
+                    enterpriseName: '',
+                    mobile: '',
+                    uniformSocialCreditCode: '',
+                    legalPerson: ''
+                },
+                ids: [],
+                options: []
+            }
+        },
+        components: {
+            AddOrUpdate
+        },
+        created: function () {
+            this.getOptions()
+        },
+        watch: {
+            'ids': function (val) {
+                if (val.length === 0) {
+                    this.dataForm.streetId = ''
+                    this.dataForm.communityId = ''
+                    this.dataForm.gridId = ''
+                }
+                if (val.length === 1) {
+                    this.dataForm.streetId = this.ids[0]
+                    this.dataForm.communityId = ''
+                    this.dataForm.gridId = ''
+                }
+                if (val.length === 2) {
+                    this.dataForm.streetId = this.ids[0]
+                    this.dataForm.communityId = this.ids[1]
+                    this.dataForm.gridId = ''
+                }
+                if (val.length === 3) {
+                    this.dataForm.streetId = this.ids[0]
+                    this.dataForm.communityId = this.ids[1]
+                    this.dataForm.gridId = this.ids[2]
+                }
+            }
+        },
+        methods: {
+            getOptions() {
+                this.$http.get(`/sys/dept/party/getDeptTreeForEpiDemic`).then(({data: res}) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    }
+                    this.options = res.data.options
+                }).catch(() => {
+                })
+            },
+            showFlagFormat(row, column) {
+                if (row.sex === '0') {
+                    return '女'
+                } else {
+                    return '男'
+                }
+            },
+            btKeyUpenterpriseName(e){
+                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+                this.dataForm.enterpriseName = e.target.value
+            },
+            btKeyUpuniformSocialCreditCode(e){
+                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+                this.dataForm.uniformSocialCreditCode = e.target.value
+            },
+            btKeyUpmobile(e){
+                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+                this.dataForm.mobile = e.target.value
+            },
+            btKeyUplegalPerson(e){
+                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+                this.dataForm.legalPerson = e.target.value
+            },
         }
-        this.options = res.data.options
-      }).catch(() => {})
-    },
-    showFlagFormat (row, column) {
-      if (row.sex === '0') {
-        return '女'
-      } else {
-        return '男'
-      }
     }
-  }
-}
 </script>
diff --git a/src/views/modules/master/masternotice.vue b/src/views/modules/master/masternotice.vue
index c1b50452..1f2b164e 100755
--- a/src/views/modules/master/masternotice.vue
+++ b/src/views/modules/master/masternotice.vue
@@ -3,7 +3,8 @@
     <div class="mod-__masternotice}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item label="通知内容" prop="noticeContent" >
-          <el-input style="width:200px" v-model="dataForm.noticeContent" placeholder="通知内容" clearable  maxlength="50"></el-input>
+          <el-input style="width:200px" v-model="dataForm.noticeContent"
+                    placeholder="通知内容" clearable  maxlength="50" @keyup.native="btKeyUpnoticeContent"></el-input>
         </el-form-item>
         <el-form-item label="状态" prop="state">
           <el-select v-model="dataForm.state" placeholder="状态" clearable style="width:200px">
@@ -244,7 +245,11 @@ export default {
     manageHandle (noticeId, browseNum) {
       this.$parent.selectComponent = 'Masternoticedetail'
       this.$router.push({ path: '/master-masternoticeroute', query: { noticeId: noticeId, browseNum: browseNum } })
-    }
+    },
+    btKeyUpnoticeContent(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.noticeContent = e.target.value
+    },
   }
 }
 </script>
diff --git a/src/views/modules/master/mastertopic.vue b/src/views/modules/master/mastertopic.vue
index f548793a..510d7d28 100755
--- a/src/views/modules/master/mastertopic.vue
+++ b/src/views/modules/master/mastertopic.vue
@@ -3,10 +3,11 @@
     <div class="mod-__mastertopic}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item label="话题内容" prop="topicContent">
-          <el-input v-model="dataForm.topicContent" placeholder="话题内容" clearable  maxlength="50"></el-input>
+          <el-input v-model="dataForm.topicContent" placeholder="话题内容"
+                    clearable  maxlength="50" @keyup.native="btKeyUptopicContent"></el-input>
         </el-form-item>
         <el-form-item label="发言人" prop="nickName">
-          <el-input v-model="dataForm.nickName" placeholder="发言人" clearable></el-input>
+          <el-input v-model="dataForm.nickName" placeholder="发言人" clearable @keyup.native="btKeyUpnickName"></el-input>
         </el-form-item>
         <el-form-item label="排行榜" prop="orderBy">
           <el-select v-model="dataForm.orderBy" placeholder="类别" clearable>
@@ -268,7 +269,15 @@ export default {
       this.closeDialog = true
       this.optionForm.id = row.id
       this.optionForm.state = 0
-    }
+    },
+    btKeyUptopicContent(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.topicContent = e.target.value
+    },
+    btKeyUpnickName(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.nickName = e.target.value
+    },
   }
 }
 </script>
diff --git a/src/views/modules/master/masteruserrelation.vue b/src/views/modules/master/masteruserrelation.vue
index ef87c8e1..94cfd570 100755
--- a/src/views/modules/master/masteruserrelation.vue
+++ b/src/views/modules/master/masteruserrelation.vue
@@ -1,196 +1,217 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-__masteruserrelation}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
-        <!-- <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
-        </el-form-item> -->
-        <el-form-item label="群内昵称" prop="nickname">
-          <el-input v-model="dataForm.nickname" placeholder="群内昵称" clearable maxlength="10" @keyup.native="btKeyUpNickname"></el-input>
-        </el-form-item>
-        <el-form-item label="真实姓名" prop="realName">
-          <el-input v-model="dataForm.realName" placeholder="真实姓名" clearable maxlength="10" @keyup.native="btKeyUpRealName"></el-input>
-        </el-form-item>
-        <br/>
-        <el-form-item label="时间"
-                      prop="startTime" label-width="67px" >
-          <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-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataListOverWrite()" type="primary">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="success" @click="addHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <!-- <el-form-item>
-          <el-button type="primary" @click="addOrUpdateHandle()">测试按钮-新增</el-button>
-        </el-form-item> -->
-        <el-form-item>
-          <el-button v-if="$hasPermission(':masteruserrelation:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</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="序号" header-align="center" align="center" width="50px">
-            <template slot-scope="scope">
-                {{scope.$index+1}}
-            </template>
-        </el-table-column>
-        <el-table-column prop="nickname" label="成员群内昵称" header-align="center" align="center" width="120"></el-table-column>
-        <el-table-column prop="manageFlag" label="成员身份" header-align="center" align="center" :formatter="manageFlagFormat" width="120"></el-table-column>
-        <el-table-column prop="realName" label="真实姓名" header-align="center" align="center" width="120"></el-table-column>
-        <el-table-column prop="mobile" label="电话" header-align="center" align="center" width="150"></el-table-column>
-        <el-table-column prop="deptName" label="所属部门" header-align="center" align="center" min-width="150"></el-table-column>
-        <el-table-column prop="loginName" label="登录名" header-align="center" align="center" width="120"></el-table-column>
-        <el-table-column prop="createdTime" label="添加时间" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="170">
-          <template slot-scope="scope">
-            <el-button v-if="scope.row.manageFlag == '1'" type="text" size="small" @click="updateManageFlagHandle(scope.row.id,'0')">解除管理员</el-button>
-            <el-button v-if="scope.row.manageFlag == '0'" type="text" size="small" @click="updateManageFlagHandle(scope.row.id,'1')">设置管理员</el-button>
-            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
+    <el-card shadow="never" class="aui-card--fill">
+        <div class="mod-__masteruserrelation}">
+            <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+                <!-- <el-form-item>
+                  <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+                </el-form-item> -->
+                <el-form-item label="群内昵称" prop="nickname">
+                    <el-input v-model="dataForm.nickname" placeholder="群内昵称" clearable maxlength="10"
+                              @keyup.native="btKeyUpNickname"></el-input>
+                </el-form-item>
+                <el-form-item label="真实姓名" prop="realName">
+                    <el-input v-model="dataForm.realName" placeholder="真实姓名" clearable maxlength="10"
+                              @keyup.native="btKeyUpRealName"></el-input>
+                </el-form-item>
+                <br/>
+                <el-form-item label="时间"
+                              prop="startTime" label-width="67px">
+                    <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-date-picker>
+                </el-form-item>
+                <el-form-item>
+                    <el-button @click="getDataListOverWrite()" type="primary">{{ $t('query') }}</el-button>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="success" @click="addHandle()">{{ $t('add') }}</el-button>
+                </el-form-item>
+                <!-- <el-form-item>
+                  <el-button type="primary" @click="addOrUpdateHandle()">测试按钮-新增</el-button>
+                </el-form-item> -->
+                <el-form-item>
+                    <el-button v-if="$hasPermission(':masteruserrelation:delete')" type="danger"
+                               @click="deleteHandle()">{{ $t('deleteBatch') }}
+                    </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="序号" header-align="center" align="center" width="50px">
+                    <template slot-scope="scope">
+                        {{scope.$index+1}}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="nickname" label="成员群内昵称" header-align="center" align="center"
+                                 width="120"></el-table-column>
+                <el-table-column prop="manageFlag" label="成员身份" header-align="center" align="center"
+                                 :formatter="manageFlagFormat" width="120"></el-table-column>
+                <el-table-column prop="realName" label="真实姓名" header-align="center" align="center"
+                                 width="120"></el-table-column>
+                <el-table-column prop="mobile" label="电话" header-align="center" align="center"
+                                 width="150"></el-table-column>
+                <el-table-column prop="deptName" label="所属部门" header-align="center" align="center"
+                                 min-width="150"></el-table-column>
+                <el-table-column prop="loginName" label="登录名" header-align="center" align="center"
+                                 width="120"></el-table-column>
+                <el-table-column prop="createdTime" label="添加时间" header-align="center" align="center"
+                                 width="180"></el-table-column>
+                <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="170">
+                    <template slot-scope="scope">
+                        <el-button v-if="scope.row.manageFlag == '1'" type="text" size="small"
+                                   @click="updateManageFlagHandle(scope.row.id,'0')">解除管理员
+                        </el-button>
+                        <el-button v-if="scope.row.manageFlag == '0'" type="text" size="small"
+                                   @click="updateManageFlagHandle(scope.row.id,'1')">设置管理员
+                        </el-button>
+                        <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update')
+                            }}
+                        </el-button>
+                        <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}
+                        </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>
+            <!-- 弹窗, 新增 / 修改 -->
+            <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+        </div>
+    </el-card>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './masteruserrelation-add-or-update'
-export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/cloudAnalysis/masteruserrelation/page',
-        getDataListIsPage: true,
-        deleteURL: '/cloudAnalysis/masteruserrelation',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        id: '',
-        nickname: '',
-        realName: ''
-      },
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          let beginDateVal = this.dataForm.endTime
-          if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
-      pickerBeginDateAfter: {
-        disabledDate: (time) => {
-          let EndDateVal = this.dataForm.startTime
-          if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-          }
-        }
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  },
-  created: function () {
-    this.getDataList()
-  },
-  methods: {
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
-    btKeyUpNickname (e) {
-      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
-      this.dataForm.nickname = e.target.value
-    },
-    btKeyUpRealName (e) {
-      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
-      this.dataForm.realName = e.target.value
-    },
-    addHandle () {
-      this.$parent.selectComponent = 'MasteruserrelationAdd'
-      this.$router.push({ path: '/master-masteruserrelationroute' })
-    },
-    manageFlagFormat (row, column) {
-      if (row.manageFlag === '0') {
-        return '群成员'
-      } else {
-        return '管理员'
-      }
-    },
-    updateManageFlagHandle (id, flag) {
-      let contentInfo = ''
-      let titleInfo = ''
-      if (flag === '0') {
-        contentInfo = '将该成员的管理权限解除，解除后无法管理，不能置顶、关闭等权限。'
-        titleInfo = '确认要解除管理员身份吗?'
-      } else {
-        contentInfo = '将该成员设置为管理员身份，管理员可以将通知和话题置顶、关闭等权限。'
-        titleInfo = '确认要设置管理员身份吗?'
-      }
-      this.$confirm(contentInfo, titleInfo, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.disAbled = true
-        this.$http.get(`/cloudAnalysis/masteruserrelation/updateManageFlag/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.getDataList()
+    import mixinViewModule from '@/mixins/view-module'
+    import AddOrUpdate from './masteruserrelation-add-or-update'
+
+    export default {
+        mixins: [mixinViewModule],
+        data() {
+            return {
+                mixinViewModuleOptions: {
+                    getDataListURL: '/cloudAnalysis/masteruserrelation/page',
+                    getDataListIsPage: true,
+                    deleteURL: '/cloudAnalysis/masteruserrelation',
+                    deleteIsBatch: true
+                },
+                dataForm: {
+                    id: '',
+                    nickname: '',
+                    realName: ''
+                },
+                pickerBeginDateBefore: {
+                    disabledDate: (time) => {
+                        let beginDateVal = this.dataForm.endTime
+                        if (beginDateVal) {
+                            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+                        }
+                    }
+                },
+                pickerBeginDateAfter: {
+                    disabledDate: (time) => {
+                        let EndDateVal = this.dataForm.startTime
+                        if (EndDateVal) {
+                            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+                        }
+                    }
+                }
             }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'success',
-            message: '操作成功！'
-          })
-        })
-      }).catch(() => {})
+        },
+        components: {
+            AddOrUpdate
+        },
+        created: function () {
+            this.getDataList()
+        },
+        methods: {
+            getDataListOverWrite() {
+                this.page = 1
+                this.getDataList()
+            },
+            btKeyUpNickname(e) {
+                e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+                this.dataForm.nickname = e.target.value
+            },
+            btKeyUpRealName(e) {
+                e.target.value = e.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
+                this.dataForm.realName = e.target.value
+            },
+            addHandle() {
+                this.$parent.selectComponent = 'MasteruserrelationAdd'
+                this.$router.push({path: '/master-masteruserrelationroute'})
+            },
+            manageFlagFormat(row, column) {
+                if (row.manageFlag === '0') {
+                    return '群成员'
+                } else {
+                    return '管理员'
+                }
+            },
+            updateManageFlagHandle(id, flag) {
+                let contentInfo = ''
+                let titleInfo = ''
+                if (flag === '0') {
+                    contentInfo = '将该成员的管理权限解除，解除后无法管理，不能置顶、关闭等权限。'
+                    titleInfo = '确认要解除管理员身份吗?'
+                } else {
+                    contentInfo = '将该成员设置为管理员身份，管理员可以将通知和话题置顶、关闭等权限。'
+                    titleInfo = '确认要设置管理员身份吗?'
+                }
+                this.$confirm(contentInfo, titleInfo, {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    this.disAbled = true
+                    this.$http.get(`/cloudAnalysis/masteruserrelation/updateManageFlag/${id}`).then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        }
+                        this.$message({
+                            message: this.$t('prompt.success'),
+                            type: 'success',
+                            duration: 500,
+                            onClose: () => {
+                                this.getDataList()
+                            }
+                        })
+                    }).catch(() => {
+                        this.$message({
+                            type: 'success',
+                            message: '操作成功！'
+                        })
+                    })
+                }).catch(() => {
+                })
+            }
+        }
     }
-  }
-}
 </script>
 <style scoped>
-.el-input {
-    width: 200px;
-  }
+    .el-input {
+        width: 200px;
+    }
 </style>
\ No newline at end of file
diff --git a/src/views/modules/news/allnews.vue b/src/views/modules/news/allnews.vue
index 38b3574e..aad0918b 100644
--- a/src/views/modules/news/allnews.vue
+++ b/src/views/modules/news/allnews.vue
@@ -4,60 +4,13 @@
     <div class="mod-news__news}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <el-form-item label="所属机构">
           <el-cascader v-model="deptIdList"
                        :options="options"
                        :props="{ checkStrictly: true }"
                        clearable></el-cascader>
         </el-form-item>
-        <!--<el-form-item label="所属街道"
-                      prop="deptId">
-          <el-select v-model="dataForm.streetId"
-                     @change="changeStreet"
-                     clearable
-                     placeholder="所属街道">
-            <el-option v-for="item in streetList"
-                       :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"
-                     @change="changeCommunity"
-                     clearable
-                     placeholder="所属社区">
-            <el-option v-for="item in communityList"
-                       :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"
-                     @change="changeGrid"
-                     clearable
-                     placeholder="所属网格">
-            <el-option v-for="item in gridList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>-->
-        <br>
-        <span class="demonstration">提交时间</span>&nbsp;&nbsp;
-        <el-date-picker @change='setRegistTime'
-                        v-model="time"
-                        value-format="yyyy-MM-dd"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期">
-        </el-date-picker> &nbsp; &nbsp;
         <el-form-item label="类别">
           <el-select v-model="dataForm.category"
                      clearable
@@ -69,19 +22,29 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="关键字">
+        <el-form-item label="关键字" >
           <el-form-item>
-            <el-input v-model="dataForm.keyword"
+            <el-input v-model="dataForm.keyword" @keyup.native="btKeyUpkeyword"
                       placeholder="请输入标题"
                       clearable></el-input>
           </el-form-item>
         </el-form-item>
+        <el-form-item label="提交时间">
+          <el-date-picker @change='setRegistTime'
+                          v-model="time"
+                          value-format="yyyy-MM-dd"
+                          type="daterange"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期">
+          </el-date-picker> &nbsp;
+        </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:news:save')"
-                     type="primary"
+                     type="success"
                      @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
@@ -390,7 +353,11 @@ export default {
       }).catch(() => {
         this.dataListLoading = false
       })
-    }
+    },
+    btKeyUpkeyword(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.keyword = e.target.value
+    },
   },
   components: {
     AddOrUpdate
diff --git a/src/views/modules/news/allnotice.vue b/src/views/modules/news/allnotice.vue
index e01e8684..066a0899 100644
--- a/src/views/modules/news/allnotice.vue
+++ b/src/views/modules/news/allnotice.vue
@@ -13,7 +13,7 @@
         </el-form-item>       
         <el-form-item>
           <el-form-item label="通知标题">
-            <el-input v-model="dataForm.noticeTitle"
+            <el-input v-model="dataForm.noticeTitle" @keyup.native="btKeyUpnoticeTitle"
                       placeholder="通知标题"
                       clearable></el-input>
           </el-form-item>
@@ -173,7 +173,11 @@ export default {
       if (row.street) {
         return row.street
       }
-    }
+    },
+    btKeyUpnoticeTitle(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.noticeTitle = e.target.value
+    },
   },
   watch: {
     'deptIdList': function (val) {
diff --git a/src/views/modules/news/banner.vue b/src/views/modules/news/banner.vue
index ee113adf..795e0495 100644
--- a/src/views/modules/news/banner.vue
+++ b/src/views/modules/news/banner.vue
@@ -4,17 +4,17 @@
     <div class="mod-news__banner}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.title"
+               @keyup.enter.native="getDataListSearch()">
+        <el-form-item label="标题:">
+          <el-input v-model="dataForm.title" @keyup.native="btKeyUptitle"
                     placeholder="请输入标题"
                     clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary"
+          <el-button type="success"
                      @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
       </el-form>
@@ -217,7 +217,11 @@ export default {
           this.positionList = res.data
         }
       }).catch(() => { })
-    }
+    },
+    btKeyUptitle(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.title = e.target.value
+    },
   }
 }
 </script>
diff --git a/src/views/modules/news/news.vue b/src/views/modules/news/news.vue
index 2a756837..ba2fdab2 100644
--- a/src/views/modules/news/news.vue
+++ b/src/views/modules/news/news.vue
@@ -1,417 +1,436 @@
 <template>
-  <el-card shadow="never"
-           class="aui-card--fill">
-    <div class="mod-news__news}">
-      <el-form :inline="true"
-               :model="dataForm"
-               @keyup.enter.native="getDataListSearch()">
-        <el-form-item label="所属机构">
-          <el-cascader v-model="deptIdList"
-                       :options="options"
-                       :props="{ checkStrictly: true }"
-                       clearable></el-cascader>
-        </el-form-item>
-        <el-form-item label="类别">
-          <el-select v-model="dataForm.category"
-                     clearable
-                     placeholder="所属类别">
-            <el-option v-for="item in categorys"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="关键字">
-          <el-form-item>
-            <el-input v-model="dataForm.keyword"
-                      placeholder="请输入标题"
-                      clearable></el-input>
-          </el-form-item>
-        </el-form-item>
-        <!--<el-form-item label="所属街道"
-                      prop="deptId">
-          <el-select v-model="dataForm.streetId"
-                     @change="changeStreet"
-                     clearable
-                     placeholder="所属街道">
-            <el-option v-for="item in streetList"
-                       :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"
-                     @change="changeCommunity"
-                     clearable
-                     placeholder="所属社区">
-            <el-option v-for="item in communityList"
-                       :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"
-                     @change="changeGrid"
-                     clearable
-                     placeholder="所属网格">
-            <el-option v-for="item in gridList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>-->
-        <br>
-        <span class="demonstration">提交时间</span>&nbsp;&nbsp;
-        <el-date-picker @change='setRegistTime'
-                        v-model="time"
-                        value-format="yyyy-MM-dd"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期">
-        </el-date-picker> &nbsp; &nbsp;
+    <el-card shadow="never"
+             class="aui-card--fill">
+        <div class="mod-news__news}">
+            <el-form :inline="true"
+                     :model="dataForm"
+                     @keyup.enter.native="getDataListSearch()">
+                <el-form-item label="所属机构">
+                    <el-cascader v-model="deptIdList"
+                                 :options="options"
+                                 :props="{ checkStrictly: true }"
+                                 clearable></el-cascader>
+                </el-form-item>
+                <el-form-item label="类别">
+                    <el-select v-model="dataForm.category"
+                               clearable
+                               placeholder="所属类别">
+                        <el-option v-for="item in categorys"
+                                   :key="item.id"
+                                   :label="item.name"
+                                   :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="关键字">
+                    <el-form-item>
+                        <el-input v-model="dataForm.keyword"  @keyup.native="btKeyUpkeyword"
+                                  placeholder="请输入标题"
+                                  clearable></el-input>
+                    </el-form-item>
+                </el-form-item>
+                <!--<el-form-item label="所属街道"
+                              prop="deptId">
+                  <el-select v-model="dataForm.streetId"
+                             @change="changeStreet"
+                             clearable
+                             placeholder="所属街道">
+                    <el-option v-for="item in streetList"
+                               :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"
+                             @change="changeCommunity"
+                             clearable
+                             placeholder="所属社区">
+                    <el-option v-for="item in communityList"
+                               :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"
+                             @change="changeGrid"
+                             clearable
+                             placeholder="所属网格">
+                    <el-option v-for="item in gridList"
+                               :key="item.id"
+                               :label="item.name"
+                               :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>-->
+                <br>
+                <span class="demonstration">提交时间</span>&nbsp;&nbsp;
+                <el-date-picker @change='setRegistTime'
+                                v-model="time"
+                                value-format="yyyy-MM-dd"
+                                type="daterange"
+                                range-separator="至"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期">
+                </el-date-picker> &nbsp; &nbsp;
 
-        <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('news:news:save')"
-                     type="primary"
-                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('news:news:delete')"
-                     type="danger"
-                     @click="deleteHandle()">{{ $t('deleteBatch') }}</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="序号"
-                         width="50px"
-                         align="center">
-          <template slot-scope="scope">
-            {{scope.$index+1}}
-          </template>
-        </el-table-column>
-        <el-table-column prop="newsTitle"
-                         label="标题名称"
-                         header-align="center"
-                         align="center"
-                         min-width="250"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="readingAmount"
-                         label="阅读量"
-                         header-align="center"
-                         align="center"
-                         width="100"></el-table-column>
-        <el-table-column prop="likeNumber"
-                         label="支持数"
-                         width="100"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="unLikeNumber"
-                         label="不支持数"
-                         width="100"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="createdTime"
-                         label="提交时间"
-                         header-align="center"
-                         width="180"
-                         align="center"></el-table-column>
-        <el-table-column prop="creatorName"
-                         label="提交人"
-                         show-overflow-tooltip
-                         min-width="200"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column label="有效时间" width="360" header-align="center" align="center">
-          <template slot-scope="scope">
-            {{scope.row.newsReleaseStartTime}} 到  {{scope.row.newsReleaseEndTime}}
-          </template>
-        </el-table-column>
-        <el-table-column label="发布状态"
-                         :formatter="publishState"
-                         header-align="center"
-                         width="120"
-                         align="center">
-        </el-table-column>
-        <!-- <el-table-column prop="newsUpDownState" label="新闻上下线状态" :formatter="newsUpDownState" 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 type="text"
-                       size="small"
-                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button type="text"
-                       size="small"
-                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-            <el-button v-if="$hasPermission('news:show:down') && scope.row.newsUpDownState === '0' && new Date(scope.row.newsReleaseStartTime.replace('-', '/')) < new Date()
+                <el-form-item>
+                    <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+                </el-form-item>
+                <el-form-item>
+                    <el-button v-if="$hasPermission('news:news:save')"
+                               type="primary"
+                               @click="addOrUpdateHandle()">{{ $t('add') }}
+                    </el-button>
+                </el-form-item>
+                <el-form-item>
+                    <el-button v-if="$hasPermission('news:news:delete')"
+                               type="danger"
+                               @click="deleteHandle()">{{ $t('deleteBatch') }}
+                    </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="序号"
+                                 width="50px"
+                                 align="center">
+                    <template slot-scope="scope">
+                        {{scope.$index+1}}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="newsTitle"
+                                 label="标题名称"
+                                 header-align="center"
+                                 align="center"
+                                 min-width="250"
+                                 show-overflow-tooltip></el-table-column>
+                <el-table-column prop="readingAmount"
+                                 label="阅读量"
+                                 header-align="center"
+                                 align="center"
+                                 width="100"></el-table-column>
+                <el-table-column prop="likeNumber"
+                                 label="支持数"
+                                 width="100"
+                                 header-align="center"
+                                 align="center"></el-table-column>
+                <el-table-column prop="unLikeNumber"
+                                 label="不支持数"
+                                 width="100"
+                                 header-align="center"
+                                 align="center"></el-table-column>
+                <el-table-column prop="createdTime"
+                                 label="提交时间"
+                                 header-align="center"
+                                 width="180"
+                                 align="center"></el-table-column>
+                <el-table-column prop="creatorName"
+                                 label="提交人"
+                                 show-overflow-tooltip
+                                 min-width="200"
+                                 header-align="center"
+                                 align="center"></el-table-column>
+                <el-table-column label="有效时间" width="360" header-align="center" align="center">
+                    <template slot-scope="scope">
+                        {{scope.row.newsReleaseStartTime}} 到 {{scope.row.newsReleaseEndTime}}
+                    </template>
+                </el-table-column>
+                <el-table-column label="发布状态"
+                                 :formatter="publishState"
+                                 header-align="center"
+                                 width="120"
+                                 align="center">
+                </el-table-column>
+                <!-- <el-table-column prop="newsUpDownState" label="新闻上下线状态" :formatter="newsUpDownState" 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 type="text"
+                                   size="small"
+                                   @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}
+                        </el-button>
+                        <el-button type="text"
+                                   size="small"
+                                   @click="deleteHandle(scope.row.id)">{{ $t('delete') }}
+                        </el-button>
+                        <el-button v-if="$hasPermission('news:show:down') && scope.row.newsUpDownState === '0' && new Date(scope.row.newsReleaseStartTime.replace('-', '/')) < new Date()
              && new Date(scope.row.newsReleaseEndTime.replace('-', '/')) > new Date()"
 
-                       type="text"
-                       size="small"
-                       @click="modifyOnLine(scope.row)">下线</el-button>
-            <el-button v-if="$hasPermission('news:banner:up') && scope.row.bannerFlag === '0' && scope.row.newsUpDownState === '0' && new Date(scope.row.newsReleaseStartTime.replace('-', '/')) < new Date()
+                                   type="text"
+                                   size="small"
+                                   @click="modifyOnLine(scope.row)">下线
+                        </el-button>
+                        <el-button v-if="$hasPermission('news:banner:up') && scope.row.bannerFlag === '0' && scope.row.newsUpDownState === '0' && new Date(scope.row.newsReleaseStartTime.replace('-', '/')) < new Date()
              && new Date(scope.row.newsReleaseEndTime.replace('-', '/')) > new Date() "
-                       type="text"
-                       size="small"
-                       @click="newsToBanner(scope.row)">上banner</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>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible"
-                     ref="addOrUpdate"
-                     @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
+                                   type="text"
+                                   size="small"
+                                   @click="newsToBanner(scope.row)">上banner
+                        </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>
+            <!-- 弹窗, 新增 / 修改 -->
+            <add-or-update v-if="addOrUpdateVisible"
+                           ref="addOrUpdate"
+                           @refreshDataList="getDataList"></add-or-update>
+        </div>
+    </el-card>
 </template>
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './news-add-or-update'
-export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/news/news/page',
-        getDataListIsPage: true,
-        deleteURL: '/news/news',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        id: '',
-        streetId: '',
-        communityId: '',
-        gridId: '',
-        startTime: '',
-        endTime: '',
-        keyword: '',
-        category: ''
-      },
-      time: '',
-      options: [],
-      deptIdList: [],
-      streetList: [],
-      communityList: [],
-      gridList: [],
-      categorys: [],
-      onLine: {
-        id: '',
-        onLineState: ''
-      }
-    }
-  },
-  created () {
-    this.$http
-      .get(`/sys/user/deptOptions/getByLoginUser`)
-      .then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.options = res.data.options
-      })
-      .catch(() => { })
-    this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
-    this.getListCategory()
-  },
-  methods: {
-    newsUpDownState: function (row) {
-      return row.newsUpDownState === '1' ? '下线' : '上线'
-    },
-    publishState: function (row) {
-      var stdt = new Date(row.newsReleaseStartTime.replace('-', '/'))
-      var eddt = new Date(row.newsReleaseEndTime.replace('-', '/'))
-      var nowdt = new Date()
-      if (row.newsUpDownState === '1') {
-        // 手动下线
-        return '已下线'
-      }
-      if (nowdt > stdt && nowdt < eddt && row.newsUpDownState === '0') {
-        return '已上线'
-      }
-      if (nowdt < stdt) {
-        return '未上线'
-      }
-      if (nowdt > eddt) {
-        return '已下线'
-      }
-    },
-    // 获取部门列表
-    getDeptInfoList (dataReceiver, faDeptId) {
-      this.$http.get(`/sys/dept/sublist/` + faDeptId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        if (dataReceiver === 'street') {
-          this.streetList = res.data
-        } else if (dataReceiver === 'community') {
-          this.communityList = res.data
-        } else if (dataReceiver === 'grid') {
-          this.gridList = res.data
-        }
-      }).catch(() => { })
-    },
-    changeStreet (event) {
-      if (this.dataForm.streetId === '') {
-        this.communityList = []
-        this.gridList = []
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-        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.communityList = this.gridList = []
-      this.getDeptInfoList('community', event)
-    },
-    changeCommunity (event) {
-      if (this.dataForm.communityId === '') {
-        this.gridList = []
-        this.dataForm.gridId = ''
-        return
-      }
-      this.communityId = event
-      let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
-      this.initDeptIdAndName(choosenItem)
-      this.dataForm.gridId = 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.initDeptIdAndName(choosenItem)
-    },
-    initDeptIdAndName (choosenItem) {
-      this.dataForm.dept = choosenItem.name
-      this.dataForm.deptId = choosenItem.id
-    },
-    setRegistTime () {
-      console.log(this.time[0])
-      this.dataForm.startTime = this.time[0]
-      this.dataForm.endTime = this.time[1]
-    },
-    getListCategory () {
-      this.$http.get(`/news/newscategory/category/`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.categorys = res.data
-      }).catch(() => { })
-    },
-    modifyOnLine (row) {
-      this.$confirm(this.$t('prompt.info', { 'handle': '下线' }), this.$t('下线'), {
-        confirmButtonText: this.$t('confirm'),
-        cancelButtonText: this.$t('cancel'),
-        type: 'warning'
-      }).then(() => {
-        this.onLine.id = row.id
-        this.onLine.onLineState = '0'
-        console.log(this.onLine)
-        this.$http.post(`/news/news/modifyOnLine/`, this.onLine).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
+    import mixinViewModule from '@/mixins/view-module'
+    import AddOrUpdate from './news-add-or-update'
+
+    export default {
+        mixins: [mixinViewModule],
+        data() {
+            return {
+                mixinViewModuleOptions: {
+                    getDataListURL: '/news/news/page',
+                    getDataListIsPage: true,
+                    deleteURL: '/news/news',
+                    deleteIsBatch: true
+                },
+                dataForm: {
+                    id: '',
+                    streetId: '',
+                    communityId: '',
+                    gridId: '',
+                    startTime: '',
+                    endTime: '',
+                    keyword: '',
+                    category: ''
+                },
+                time: '',
+                options: [],
+                deptIdList: [],
+                streetList: [],
+                communityList: [],
+                gridList: [],
+                categorys: [],
+                onLine: {
+                    id: '',
+                    onLineState: ''
+                }
             }
-          })
-          this.getDataList()
-        }).catch(() => { })
-      }).catch(() => { })
-    },
-    newsToBanner (row) {
-      this.$confirm(this.$t('prompt.info', { 'handle': '上banner' }), this.$t('上banner'), {
-        confirmButtonText: this.$t('confirm'),
-        cancelButtonText: this.$t('cancel'),
-        type: 'warning'
-      }).then(() => {
-        this.$http.post(`/news/news/newsToBanner/` + row.id).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
+        },
+        created() {
+            this.$http
+                .get(`/sys/user/deptOptions/getByLoginUser`)
+                .then(({data: res}) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    }
+                    this.options = res.data.options
+                })
+                .catch(() => {
+                })
+            this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
+            this.getListCategory()
+        },
+        methods: {
+            newsUpDownState: function (row) {
+                return row.newsUpDownState === '1' ? '下线' : '上线'
+            },
+            publishState: function (row) {
+                var stdt = new Date(row.newsReleaseStartTime.replace('-', '/'))
+                var eddt = new Date(row.newsReleaseEndTime.replace('-', '/'))
+                var nowdt = new Date()
+                if (row.newsUpDownState === '1') {
+                    // 手动下线
+                    return '已下线'
+                }
+                if (nowdt > stdt && nowdt < eddt && row.newsUpDownState === '0') {
+                    return '已上线'
+                }
+                if (nowdt < stdt) {
+                    return '未上线'
+                }
+                if (nowdt > eddt) {
+                    return '已下线'
+                }
+            },
+            // 获取部门列表
+            getDeptInfoList(dataReceiver, faDeptId) {
+                this.$http.get(`/sys/dept/sublist/` + faDeptId).then(({data: res}) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    }
+                    if (dataReceiver === 'street') {
+                        this.streetList = res.data
+                    } else if (dataReceiver === 'community') {
+                        this.communityList = res.data
+                    } else if (dataReceiver === 'grid') {
+                        this.gridList = res.data
+                    }
+                }).catch(() => {
+                })
+            },
+            changeStreet(event) {
+                if (this.dataForm.streetId === '') {
+                    this.communityList = []
+                    this.gridList = []
+                    this.dataForm.communityId = ''
+                    this.dataForm.gridId = ''
+                    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.communityList = this.gridList = []
+                this.getDeptInfoList('community', event)
+            },
+            changeCommunity(event) {
+                if (this.dataForm.communityId === '') {
+                    this.gridList = []
+                    this.dataForm.gridId = ''
+                    return
+                }
+                this.communityId = event
+                let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
+                this.initDeptIdAndName(choosenItem)
+                this.dataForm.gridId = 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.initDeptIdAndName(choosenItem)
+            },
+            initDeptIdAndName(choosenItem) {
+                this.dataForm.dept = choosenItem.name
+                this.dataForm.deptId = choosenItem.id
+            },
+            setRegistTime() {
+                console.log(this.time[0])
+                this.dataForm.startTime = this.time[0]
+                this.dataForm.endTime = this.time[1]
+            },
+            getListCategory() {
+                this.$http.get(`/news/newscategory/category/`).then(({data: res}) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    }
+                    this.categorys = res.data
+                }).catch(() => {
+                })
+            },
+            modifyOnLine(row) {
+                this.$confirm(this.$t('prompt.info', {'handle': '下线'}), this.$t('下线'), {
+                    confirmButtonText: this.$t('confirm'),
+                    cancelButtonText: this.$t('cancel'),
+                    type: 'warning'
+                }).then(() => {
+                    this.onLine.id = row.id
+                    this.onLine.onLineState = '0'
+                    console.log(this.onLine)
+                    this.$http.post(`/news/news/modifyOnLine/`, this.onLine).then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        }
+                        this.$message({
+                            message: this.$t('prompt.success'),
+                            type: 'success',
+                            duration: 500,
+                            onClose: () => {
+                            }
+                        })
+                        this.getDataList()
+                    }).catch(() => {
+                    })
+                }).catch(() => {
+                })
+            },
+            newsToBanner(row) {
+                this.$confirm(this.$t('prompt.info', {'handle': '上banner'}), this.$t('上banner'), {
+                    confirmButtonText: this.$t('confirm'),
+                    cancelButtonText: this.$t('cancel'),
+                    type: 'warning'
+                }).then(() => {
+                    this.$http.post(`/news/news/newsToBanner/` + row.id).then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        }
+                        this.$message({
+                            message: this.$t('prompt.success'),
+                            type: 'success',
+                            duration: 500,
+                            onClose: () => {
+                            }
+                        })
+                        this.getDataList()
+                    }).catch(() => {
+                    })
+                }).catch(() => {
+                })
+            },
+            // 获取数据列表
+            getDataList() {
+                if (this.time === null) {
+                    this.dataForm.startTime = ''
+                    this.dataForm.endTime = ''
+                }
+                this.dataListLoading = true
+                this.$http.get(
+                    this.mixinViewModuleOptions.getDataListURL,
+                    {
+                        params: {
+                            order: this.order,
+                            orderField: this.orderField,
+                            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
+                            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
+                            ...this.dataForm
+                        }
+                    }
+                ).then(({data: res}) => {
+                    this.dataListLoading = false
+                    if (res.code !== 0) {
+                        this.dataList = []
+                        this.total = 0
+                        return this.$message.error(res.msg)
+                    }
+                    this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
+                    this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
+                }).catch(() => {
+                    this.dataListLoading = false
+                })
+            },
+            //特殊字符处理
+            btKeyUpkeyword(e) {
+                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+                this.dataForm.keyword = e.target.value
+            },
+        },
+            components: {
+                AddOrUpdate
+            },
+            watch: {
+                'deptIdList': function (val) {
+                    if (val.length !== 0) {
+                        this.dataForm.gridId = val[val.length - 1]
+                    } else {
+                        this.dataForm.gridId = ''
+                    }
+                }
             }
-          })
-          this.getDataList()
-        }).catch(() => { })
-      }).catch(() => { })
-    },
-    // 获取数据列表
-    getDataList () {
-      if (this.time === null) {
-        this.dataForm.startTime = ''
-        this.dataForm.endTime = ''
-      }
-      this.dataListLoading = true
-      this.$http.get(
-        this.mixinViewModuleOptions.getDataListURL,
-        {
-          params: {
-            order: this.order,
-            orderField: this.orderField,
-            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
-            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
-            ...this.dataForm
-          }
-        }
-      ).then(({ data: res }) => {
-        this.dataListLoading = false
-        if (res.code !== 0) {
-          this.dataList = []
-          this.total = 0
-          return this.$message.error(res.msg)
         }
-        this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
-        this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
-      }).catch(() => {
-        this.dataListLoading = false
-      })
-    }
-  },
-  components: {
-    AddOrUpdate
-  },
-  watch: {
-    'deptIdList': function (val) {
-      if (val.length !== 0) {
-        this.dataForm.gridId = val[val.length - 1]
-      } else {
-        this.dataForm.gridId = ''
-      }
-    }
-  }
-}
 </script>
diff --git a/src/views/modules/news/newsdraft.vue b/src/views/modules/news/newsdraft.vue
index 578bfd12..c6edc3f2 100644
--- a/src/views/modules/news/newsdraft.vue
+++ b/src/views/modules/news/newsdraft.vue
@@ -69,9 +69,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="关键字" label-width="68px">
+        <el-form-item label="关键字" label-width="68px" >
           <el-form-item>
-            <el-input v-model="dataForm.keyword"
+            <el-input v-model="dataForm.keyword" @keyup.native="btKeyUpkeyword"
                       placeholder="请输入标题"
                       clearable></el-input>
           </el-form-item>
@@ -353,7 +353,12 @@ export default {
       }).catch(() => {
         this.dataListLoading = false
       })
-    }
+    },
+    //特殊字符处理
+    btKeyUpkeyword(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.keyword = e.target.value
+    },
   },
   components: {
     AddOrUpdate
diff --git a/src/views/modules/news/notice.vue b/src/views/modules/news/notice.vue
index f8766b94..f387af8a 100644
--- a/src/views/modules/news/notice.vue
+++ b/src/views/modules/news/notice.vue
@@ -7,7 +7,7 @@
                @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-form-item label="通知标题">
-            <el-input v-model="dataForm.noticeTitle"
+            <el-input v-model="dataForm.noticeTitle" @keyup.native="btKeyUpnoticeTitle"
                       placeholder="通知标题"
                       clearable></el-input>
           </el-form-item>
@@ -172,7 +172,11 @@ export default {
       if (row.street) {
         return row.street
       }
-    }
+    },
+    btKeyUpnoticeTitle(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.noticeTitle = e.target.value
+    },
   }
 }
 </script>
diff --git a/src/views/modules/user/alluser.vue b/src/views/modules/user/alluser.vue
index 8cdfc375..a65ed252 100644
--- a/src/views/modules/user/alluser.vue
+++ b/src/views/modules/user/alluser.vue
@@ -6,23 +6,23 @@
                :model="dataForm"
                @keyup.enter.native="getDataListSearch()">
         <el-form-item label="昵称" label-width="52px">
-          <el-input v-model="dataForm.nickname"
+          <el-input v-model="dataForm.nickname" @keyup.native="btKeyUpnickname"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="姓名" label-width="68px">
-          <el-input v-model="dataForm.realName"
+          <el-input v-model="dataForm.realName" @keyup.native="btKeyUprealName"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="手机号">
-          <el-input v-model="dataForm.mobile"
+          <el-input v-model="dataForm.mobile" @keyup.native="btKeyUpmobile"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="身份证号">
-          <el-input v-model="dataForm.identityNo"
+          <el-input v-model="dataForm.identityNo" @keyup.native="btKeyUpidentityNo"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
@@ -294,7 +294,23 @@ export default {
         this.$refs.userGrid.dataForm.id = userId
         this.$refs.userGrid.init()
       })
-    }
+    },
+    btKeyUpnickname(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.nickname = e.target.value
+    },
+    btKeyUprealName(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.realName = e.target.value
+    },
+    btKeyUpmobile(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.mobile = e.target.value
+    },
+    btKeyUpidentityNo(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.identityNo = e.target.value
+    },
   },
   components: {
     AddOrUpdate,
diff --git a/src/views/modules/user/fail-authentication.vue b/src/views/modules/user/fail-authentication.vue
index 9aadb70d..9c30226b 100644
--- a/src/views/modules/user/fail-authentication.vue
+++ b/src/views/modules/user/fail-authentication.vue
@@ -48,12 +48,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="姓名">
-          <el-input v-model="dataForm.realName"
+          <el-input v-model="dataForm.realName" @keyup.native="btKeyUprealName"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="手机号">
-          <el-input v-model="dataForm.mobile"
+          <el-input v-model="dataForm.mobile" @keyup.native="btKeyUpmobile"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
@@ -349,7 +349,15 @@ export default {
         this.$refs.userDetail.dataForm.id = userId
         this.$refs.userDetail.init()
       })
-    }
+    },
+    btKeyUprealName(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.realName = e.target.value
+    },
+    btKeyUpmobile(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.mobile = e.target.value
+    },
   },
   components: {
     AddOrUpdate,
diff --git a/src/views/modules/user/pass-authentication.vue b/src/views/modules/user/pass-authentication.vue
index c33db40f..c862195a 100644
--- a/src/views/modules/user/pass-authentication.vue
+++ b/src/views/modules/user/pass-authentication.vue
@@ -48,12 +48,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="姓名">
-          <el-input v-model="dataForm.realName"
+          <el-input v-model="dataForm.realName" @keyup.native="btKeyUprealName"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="手机号">
-          <el-input v-model="dataForm.mobile"
+          <el-input v-model="dataForm.mobile" @keyup.native="btKeyUpmobile"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
@@ -352,7 +352,15 @@ export default {
         this.$refs.userGrid.dataForm.id = userId
         this.$refs.userGrid.init()
       })
-    }
+    },
+    btKeyUprealName(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.realName = e.target.value
+    },
+    btKeyUpmobile(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.mobile = e.target.value
+    },
   },
   components: {
     AddOrUpdate,
diff --git a/src/views/modules/user/unauthorized.vue b/src/views/modules/user/unauthorized.vue
index 5cbfecf7..e8143c3b 100644
--- a/src/views/modules/user/unauthorized.vue
+++ b/src/views/modules/user/unauthorized.vue
@@ -48,11 +48,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="昵称">
-          <el-input v-model="dataForm.nickname"
+          <el-input v-model="dataForm.nickname" @keyup.native="btKeyUpnickname"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item label="手机号">
+        <el-form-item label="手机号" @keyup.native="btKeyUpmobile">
           <el-input v-model="dataForm.mobile"
                     placeholder="请输入"
                     clearable></el-input>
@@ -347,7 +347,15 @@ export default {
         this.$refs.userDetail.dataForm.id = userId
         this.$refs.userDetail.init()
       })
-    }
+    },
+    btKeyUpnickname(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.nickname = e.target.value
+    },
+    btKeyUpmobile(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.mobile = e.target.value
+    },
   },
   components: {
     AddOrUpdate,
diff --git a/src/views/modules/user/wait-authentication.vue b/src/views/modules/user/wait-authentication.vue
index 1d85bf9b..9b911ab3 100644
--- a/src/views/modules/user/wait-authentication.vue
+++ b/src/views/modules/user/wait-authentication.vue
@@ -48,12 +48,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="姓名">
-          <el-input v-model="dataForm.realName"
+          <el-input v-model="dataForm.realName" @keyup.native="btKeyUprealName"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="手机号">
-          <el-input v-model="dataForm.mobile"
+          <el-input v-model="dataForm.mobile" @keyup.native="btKeyUpmobile"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
@@ -336,7 +336,15 @@ export default {
         this.$refs.userDetail.dataForm.id = userId
         this.$refs.userDetail.init()
       })
-    }
+    },
+    btKeyUprealName(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.realName = e.target.value
+    },
+    btKeyUpmobile(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.mobile = e.target.value
+    },
   },
   components: {
     AddOrUpdate,