diff --git a/src/views/modules/master/masternotice.vue b/src/views/modules/master/masternotice.vue
index 1f2b164e..82976824 100755
--- a/src/views/modules/master/masternotice.vue
+++ b/src/views/modules/master/masternotice.vue
@@ -16,7 +16,7 @@
           </el-select>
         </el-form-item>
         <div class="block">
-          <el-form-item label="时间"
+          <el-form-item label="发布时间"
                         prop="startTime" label-width="68px" >
             <el-date-picker v-model="dataForm.startTime"
                             type="date"
@@ -38,10 +38,10 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+            <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button type="success" v-if="$hasPermission('cloudAnalysis:masternotice:save')"  @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+            <el-button type="primary" v-if="$hasPermission('cloudAnalysis:masternotice:save')"  @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
           </el-form-item>
         </div>
       </el-form>
diff --git a/src/views/modules/master/mastertopic.vue b/src/views/modules/master/mastertopic.vue
index 510d7d28..0a5bcf4f 100755
--- a/src/views/modules/master/mastertopic.vue
+++ b/src/views/modules/master/mastertopic.vue
@@ -3,11 +3,10 @@
     <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" @keyup.native="btKeyUptopicContent"></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 @keyup.native="btKeyUpnickName"></el-input>
+        <el-form-item label="发言人" prop="nickName" label-width="70px">
+          <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>
@@ -18,6 +17,7 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <br>
         <el-form-item label="状态" prop="state" label-width="68px">
           <el-select v-model="dataForm.state" placeholder="状态" clearable>
             <el-option v-for="item in stateArr"
@@ -28,14 +28,15 @@
           </el-select>
         </el-form-item>
 <!--        <div class="block">-->
-          <el-form-item label="时间"
-                        prop="startTime" label-width="52px">
+          <el-form-item label="发布时间"
+                        prop="startTime" label-width="70px">
             <el-date-picker v-model="dataForm.startTime"
                             type="date"
                             :picker-options="pickerBeginDateBefore"
                             value-format="yyyy-MM-dd"
                             format="yyyy-MM-dd"
-                            placeholder="选择日期时间">
+                            placeholder="选择日期时间"
+                            style="width:200px">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="至"
@@ -46,14 +47,15 @@
                             :picker-options="pickerBeginDateAfter"
                             value-format="yyyy-MM-dd"
                             format="yyyy-MM-dd"
-                            placeholder="选择日期时间">
+                            placeholder="选择日期时间"
+                            style="width:200px">
             </el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+            <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button type="success" v-if="$hasPermission('cloudAnalysis:mastertopic:export')"
+            <el-button type="primary" v-if="$hasPermission('cloudAnalysis:mastertopic:export')"
                        @click="exportHandle()">{{ $t('export') }}</el-button>
           </el-form-item>
 <!--        </div>-->
@@ -142,7 +144,9 @@ export default {
         exportURL: '/cloudAnalysis/mastertopic/export'
       },
       dataForm: {
-        id: ''
+        id: '',
+        nickName: '',
+        topicContent: ''
       },
       optionForm: {
         id: '',
@@ -270,14 +274,14 @@ export default {
       this.optionForm.id = row.id
       this.optionForm.state = 0
     },
-    btKeyUptopicContent(e){
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+    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, '')
+    btKeyUpNickName(e){
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
       this.dataForm.nickName = e.target.value
-    },
+    }
   }
 }
 </script>
diff --git a/src/views/modules/sys/appmenutemplate.vue b/src/views/modules/sys/appmenutemplate.vue
index af808e01..bdd57c46 100644
--- a/src/views/modules/sys/appmenutemplate.vue
+++ b/src/views/modules/sys/appmenutemplate.vue
@@ -59,30 +59,35 @@
           label="模板名称"
           header-align="center"
           align="center"
+          show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           prop="templateCode"
           label="模板编码"
           header-align="center"
           align="center"
+          show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           prop="className"
           label="样式"
           header-align="center"
           align="center"
+          show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           prop="spareClassName"
           label="备用样式"
           header-align="center"
           align="center"
+          show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           prop="backgroundColor"
           label="背景颜色"
           header-align="center"
           align="center"
+          show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           :label="$t('handle')"