From 8379ef4f4cf82b75c4527f063c6cff92423af469 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 17 Sep 2020 10:55:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B8=82=E5=8C=97=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=87=B3=E5=AE=89=E5=AE=81=E3=80=91=E3=80=90?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=E3=80=91-=E7=8E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=B3=B0-2020-09-17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/job/schedule-add-or-update.vue    | 22 ++++++---
 src/views/modules/job/schedule-log.vue        | 12 ++---
 src/views/modules/job/schedule.vue            | 45 ++++++++++++-------
 src/views/modules/oss/oss-config.vue          | 42 +++++++++++++++++
 src/views/modules/oss/oss.vue                 |  7 ++-
 .../sys/analysis-menu-add-or-update.vue       | 18 ++++----
 src/views/modules/sys/analysis-menu.vue       |  2 +-
 .../modules/sys/app-menu-add-or-update.vue    | 13 +++++-
 src/views/modules/sys/app-menu.vue            |  2 +-
 .../sys/appmenutemplate-add-or-update.vue     | 23 +++++-----
 src/views/modules/sys/appmenutemplate.vue     | 23 ++++++++--
 src/views/modules/sys/dict-add-or-update.vue  | 27 ++++++++---
 src/views/modules/sys/dict.vue                | 42 ++++++++++++++---
 src/views/modules/sys/menu-add-or-update.vue  |  7 ++-
 src/views/modules/sys/menu.vue                |  2 +-
 .../modules/sys/params-add-or-update.vue      | 17 +++++--
 src/views/modules/sys/params.vue              | 27 ++++++++---
 .../modules/sys/resource-add-or-update.vue    | 13 +++---
 src/views/modules/sys/resources-list.vue      |  4 +-
 .../sys/resourcestotalrelation-list.vue       | 24 +++++++---
 .../modules/sys/totalconfig-add-or-update.vue | 20 ++++++---
 src/views/modules/sys/totalconfig-list.vue    | 34 +++++++-------
 22 files changed, 311 insertions(+), 115 deletions(-)

diff --git a/src/views/modules/job/schedule-add-or-update.vue b/src/views/modules/job/schedule-add-or-update.vue
index dde0215..78df360 100644
--- a/src/views/modules/job/schedule-add-or-update.vue
+++ b/src/views/modules/job/schedule-add-or-update.vue
@@ -1,17 +1,29 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm"  label-width="120px">
       <el-form-item prop="beanName" :label="$t('schedule.beanName')">
-        <el-input v-model="dataForm.beanName" :placeholder="$t('schedule.beanNameTips')"></el-input>
+        <el-input v-model="dataForm.beanName"
+                  maxlength="50"
+                  show-word-limit
+                  :placeholder="$t('schedule.beanNameTips')"></el-input>
       </el-form-item>
       <el-form-item prop="params" :label="$t('schedule.params')">
-        <el-input v-model="dataForm.params" :placeholder="$t('schedule.params')"></el-input>
+        <el-input v-model="dataForm.params"
+                  maxlength="120"
+                  show-word-limit
+                  :placeholder="$t('schedule.params')"></el-input>
       </el-form-item>
       <el-form-item prop="cronExpression" :label="$t('schedule.cronExpression')">
-        <el-input v-model="dataForm.cronExpression" :placeholder="$t('schedule.cronExpressionTips')"></el-input>
+        <el-input v-model="dataForm.cronExpression"
+                  maxlength="50"
+                  show-word-limit
+                  :placeholder="$t('schedule.cronExpressionTips')"></el-input>
       </el-form-item>
       <el-form-item prop="remark"  :label="$t('schedule.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('schedule.remark')"></el-input>
+        <el-input v-model="dataForm.remark"
+                  maxlength="100"
+                  show-word-limit
+                  :placeholder="$t('schedule.remark')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/job/schedule-log.vue b/src/views/modules/job/schedule-log.vue
index 6f092c5..17eb3d4 100644
--- a/src/views/modules/job/schedule-log.vue
+++ b/src/views/modules/job/schedule-log.vue
@@ -1,11 +1,11 @@
 <template>
   <el-dialog :visible.sync="visible" :title="$t('schedule.log')" :close-on-click-modal="false" :close-on-press-escape="false" width="75%">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <el-form-item>
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+      <el-form-item :label="$t('schedule.jobId')">
         <el-input v-model="dataForm.jobId" :placeholder="$t('schedule.jobId')" 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>
     <el-table
@@ -15,9 +15,9 @@
       @sort-change="dataListSortChangeHandle"
       height="460"
       style="width: 100%;">
-      <el-table-column prop="jobId" :label="$t('schedule.jobId')" header-align="center" align="center" width="80"></el-table-column>
-      <el-table-column prop="beanName" :label="$t('schedule.beanName')" header-align="center" align="center"></el-table-column>
-      <el-table-column prop="params" :label="$t('schedule.params')" header-align="center" align="center"></el-table-column>
+      <el-table-column prop="jobId" :label="$t('schedule.jobId')" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="beanName" :label="$t('schedule.beanName')" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="params" :label="$t('schedule.params')" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
       <el-table-column prop="status" :label="$t('schedule.status')" header-align="center" align="center">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.status === 1" size="small">{{ $t('schedule.statusLog1') }}</el-tag>
diff --git a/src/views/modules/job/schedule.vue b/src/views/modules/job/schedule.vue
index 5bcfa31..2cdb0f5 100644
--- a/src/views/modules/job/schedule.vue
+++ b/src/views/modules/job/schedule.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-job__schedule">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.beanName" :placeholder="$t('schedule.beanName')" clearable></el-input>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item :label="$t('schedule.beanName')">
+          <el-input v-model="dataForm.beanName" @keyup.native="btKeyUpBeanName" :placeholder="$t('schedule.beanName')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:schedule:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -15,16 +15,16 @@
           <el-button v-if="$hasPermission('sys:schedule:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:schedule:pause')" type="danger" @click="pauseHandle()">{{ $t('schedule.pauseBatch') }}</el-button>
+          <el-button v-if="$hasPermission('sys:schedule:pause')" type="warning" @click="pauseHandle()">{{ $t('schedule.pauseBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:schedule:resume')" type="danger" @click="resumeHandle()">{{ $t('schedule.resumeBatch') }}</el-button>
+          <el-button v-if="$hasPermission('sys:schedule:resume')" type="success" @click="resumeHandle()">{{ $t('schedule.resumeBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:schedule:run')" type="danger" @click="runHandle()">{{ $t('schedule.runBatch') }}</el-button>
+          <el-button v-if="$hasPermission('sys:schedule:run')" type="primary" @click="runHandle()">{{ $t('schedule.runBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:schedule:log')" type="success" @click="logHandle()">{{ $t('schedule.log') }}</el-button>
+          <el-button v-if="$hasPermission('sys:schedule:log')" class="list" @click="logHandle()">{{ $t('schedule.log') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table
@@ -35,17 +35,20 @@
         @sort-change="dataListSortChangeHandle"
         style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="beanName" :label="$t('schedule.beanName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="params" :label="$t('schedule.params')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="cronExpression" :label="$t('schedule.cronExpression')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="remark" :label="$t('schedule.remark')" header-align="center" align="center"></el-table-column>
+        <el-table-column type="index"
+                         width="50"
+                         label="序号" align="center"></el-table-column>
+        <el-table-column prop="beanName" :label="$t('schedule.beanName')" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="params" :label="$t('schedule.params')" header-align="center" align="center" min-width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="cronExpression" :label="$t('schedule.cronExpression')" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="remark" :label="$t('schedule.remark')" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="status" :label="$t('schedule.status')" sortable="custom" header-align="center" align="center">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status === 1" size="small">{{ $t('schedule.status1') }}</el-tag>
             <el-tag v-else size="small" type="danger">{{ $t('schedule.status0') }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="200">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('sys:schedule:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('sys:schedule:pause')" type="text" size="small" @click="pauseHandle(scope.row.id)">{{ $t('schedule.pause') }}</el-button>
@@ -101,7 +104,7 @@ export default {
     pauseHandle (id) {
       if (!id && this.dataListSelections.length <= 0) {
         return this.$message({
-          message: this.$t('prompt.deleteBatch'),
+          message: this.$t('prompt.selectBatch'),
           type: 'warning',
           duration: 500
         })
@@ -126,11 +129,15 @@ export default {
         }).catch(() => {})
       }).catch(() => {})
     },
+    btKeyUpBeanName (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.beanName = e.target.value
+    },
     // 恢复
     resumeHandle (id) {
       if (!id && this.dataListSelections.length <= 0) {
         return this.$message({
-          message: this.$t('prompt.deleteBatch'),
+          message: this.$t('prompt.selectBatch'),
           type: 'warning',
           duration: 500
         })
@@ -159,7 +166,7 @@ export default {
     runHandle (id) {
       if (!id && this.dataListSelections.length <= 0) {
         return this.$message({
-          message: this.$t('prompt.deleteBatch'),
+          message: this.$t('prompt.selectBatch'),
           type: 'warning',
           duration: 500
         })
@@ -194,3 +201,9 @@ export default {
   }
 }
 </script>
+<style scoped>
+  .list{
+    background: #c483ee;
+    color: #fff;
+  }
+</style>
diff --git a/src/views/modules/oss/oss-config.vue b/src/views/modules/oss/oss-config.vue
index 8a74bbc..decc76d 100644
--- a/src/views/modules/oss/oss-config.vue
+++ b/src/views/modules/oss/oss-config.vue
@@ -22,26 +22,36 @@
         <el-form-item prop="qiniuDomain"
                       :label="$t('oss.qiniuDomain')">
           <el-input v-model="dataForm.qiniuDomain"
+                    maxlength="100"
+                    show-word-limit
                     :placeholder="$t('oss.qiniuDomainTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qiniuPrefix"
                       :label="$t('oss.qiniuPrefix')">
           <el-input v-model="dataForm.qiniuPrefix"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qiniuPrefixTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qiniuAccessKey"
                       :label="$t('oss.qiniuAccessKey')">
           <el-input v-model="dataForm.qiniuAccessKey"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qiniuAccessKeyTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qiniuSecretKey"
                       :label="$t('oss.qiniuSecretKey')">
           <el-input v-model="dataForm.qiniuSecretKey"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qiniuSecretKeyTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qiniuBucketName"
                       :label="$t('oss.qiniuBucketName')">
           <el-input v-model="dataForm.qiniuBucketName"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qiniuBucketNameTips')"></el-input>
         </el-form-item>
       </template>
@@ -49,31 +59,43 @@
         <el-form-item prop="aliyunDomain"
                       :label="$t('oss.aliyunDomain')">
           <el-input v-model="dataForm.aliyunDomain"
+                    maxlength="100"
+                    show-word-limit
                     :placeholder="$t('oss.aliyunDomainTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunPrefix"
                       :label="$t('oss.aliyunPrefix')">
           <el-input v-model="dataForm.aliyunPrefix"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.aliyunPrefixTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunEndPoint"
                       :label="$t('oss.aliyunEndPoint')">
           <el-input v-model="dataForm.aliyunEndPoint"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.aliyunEndPointTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunAccessKeyId"
                       :label="$t('oss.aliyunAccessKeyId')">
           <el-input v-model="dataForm.aliyunAccessKeyId"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.aliyunAccessKeyIdTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunAccessKeySecret"
                       :label="$t('oss.aliyunAccessKeySecret')">
           <el-input v-model="dataForm.aliyunAccessKeySecret"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.aliyunAccessKeySecretTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunBucketName"
                       :label="$t('oss.aliyunBucketName')">
           <el-input v-model="dataForm.aliyunBucketName"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.aliyunBucketNameTips')"></el-input>
         </el-form-item>
       </template>
@@ -81,31 +103,43 @@
         <el-form-item prop="qcloudDomain"
                       :label="$t('oss.qcloudDomain')">
           <el-input v-model="dataForm.qcloudDomain"
+                    maxlength="100"
+                    show-word-limit
                     :placeholder="$t('oss.qcloudDomainTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudPrefix"
                       :label="$t('oss.qcloudPrefix')">
           <el-input v-model="dataForm.qcloudPrefix"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qcloudPrefixTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudAppId"
                       :label="$t('oss.qcloudAppId')">
           <el-input v-model="dataForm.qcloudAppId"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qcloudAppIdTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudSecretId"
                       :label="$t('oss.qcloudSecretId')">
           <el-input v-model="dataForm.qcloudSecretId"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qcloudSecretIdTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudSecretKey"
                       :label="$t('oss.qcloudSecretKey')">
           <el-input v-model="dataForm.qcloudSecretKey"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qcloudSecretKeyTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudBucketName"
                       :label="$t('oss.qcloudBucketName')">
           <el-input v-model="dataForm.qcloudBucketName"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qcloudBucketNameTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudRegion"
@@ -141,6 +175,8 @@
         <el-form-item prop="fastdfsDomain"
                       :label="$t('oss.fastdfsDomain')">
           <el-input v-model="dataForm.fastdfsDomain"
+                    maxlength="100"
+                    show-word-limit
                     :placeholder="$t('oss.fastdfsDomainTips')"></el-input>
         </el-form-item>
       </template>
@@ -148,16 +184,22 @@
         <el-form-item prop="localDomain"
                       :label="$t('oss.localDomain')">
           <el-input v-model="dataForm.localDomain"
+                    maxlength="100"
+                    show-word-limit
                     :placeholder="$t('oss.localDomainTips')"></el-input>
         </el-form-item>
         <el-form-item prop="localPrefix"
                       :label="$t('oss.localPrefix')">
           <el-input v-model="dataForm.localPrefix"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.localPrefixTips')"></el-input>
         </el-form-item>
         <el-form-item prop="localPath"
                       :label="$t('oss.localPath')">
           <el-input v-model="dataForm.localPath"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.localPathTips')"></el-input>
         </el-form-item>
       </template>
diff --git a/src/views/modules/oss/oss.vue b/src/views/modules/oss/oss.vue
index d1a91c7..f9fe82b 100644
--- a/src/views/modules/oss/oss.vue
+++ b/src/views/modules/oss/oss.vue
@@ -20,7 +20,12 @@
         @sort-change="dataListSortChangeHandle"
         style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="url" :label="$t('oss.url')" header-align="center" align="center"></el-table-column>
+        <el-table-column label="序号"
+                                 type="index"
+                                 align="center"
+                                 show-overflow-tooltip
+                                 width="50"></el-table-column>
+        <el-table-column prop="url" :label="$t('oss.url')" header-align="center" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="createDate" :label="$t('oss.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
diff --git a/src/views/modules/sys/analysis-menu-add-or-update.vue b/src/views/modules/sys/analysis-menu-add-or-update.vue
index a8dd5fe..2fa0d1a 100644
--- a/src/views/modules/sys/analysis-menu-add-or-update.vue
+++ b/src/views/modules/sys/analysis-menu-add-or-update.vue
@@ -9,7 +9,6 @@
       :model="dataForm"
       :rules="dataRule"
       ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
       label-width="120px"
     >
       <el-form-item prop="type" :label="$t('menu.type')" size="mini">
@@ -21,24 +20,24 @@
       <el-form-item prop="name" :label="$t('menu.name')">
         <el-input
           v-model="dataForm.name"
-          :placeholder="$t('menu.name')"
+          :placeholder="$t('menu.name')" maxlength="200"
         ></el-input>
       </el-form-item>
       <el-form-item prop="menuCode" :label="$t('menu.menuCode')">
         <el-input
           v-model="dataForm.menuCode"
-          :placeholder="$t('menu.menuCode')"
+          :placeholder="$t('menu.menuCode')" maxlength="50"
         ></el-input>
       </el-form-item>
-      <el-form-item prop="modelname" label="模块名称">
+      <el-form-item prop="modelName" label="模块名称">
         <el-input
-                v-model="dataForm.modelname"
-                placeholder="样式名称"
+                v-model="dataForm.modelName"
+                placeholder="样式名称" maxlength="255"
         ></el-input>
       </el-form-item>
       <el-form-item prop="className" label="样式名称">
         <el-input
-          v-model="dataForm.className"
+          v-model="dataForm.className" maxlength="32"
           placeholder="样式名称"
         ></el-input>
       </el-form-item>
@@ -95,6 +94,7 @@
           controls-position="right"
           :min="0"
           :label="$t('menu.sort')"
+          style="width:200px"
         ></el-input-number>
       </el-form-item>
       <el-form-item
@@ -130,7 +130,7 @@
         </el-select>
       </el-form-item>
       <el-form-item prop="remark" label="备注">
-        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+        <el-input v-model="dataForm.remark" placeholder="备注" maxlength="255"></el-input>
       </el-form-item>
       <el-form-item prop="numFlag"
                     label="是否显示数字"
@@ -232,7 +232,7 @@ export default {
         sort: 0,
         icon: '',
         menuCode: '',
-        modelname: '',
+        modelName: '',
         className: '',
         remark: '',
         templateId: '',
diff --git a/src/views/modules/sys/analysis-menu.vue b/src/views/modules/sys/analysis-menu.vue
index b722ae6..a4e3a26 100644
--- a/src/views/modules/sys/analysis-menu.vue
+++ b/src/views/modules/sys/analysis-menu.vue
@@ -4,7 +4,7 @@
       <el-form
         :inline="true"
         :model="dataForm"
-        @keyup.enter.native="getDataList()"
+        @keyup.enter.native="getDataListSearch()"
       >
         <el-form-item>
           <el-button
diff --git a/src/views/modules/sys/app-menu-add-or-update.vue b/src/views/modules/sys/app-menu-add-or-update.vue
index c6ef776..dea2ef2 100644
--- a/src/views/modules/sys/app-menu-add-or-update.vue
+++ b/src/views/modules/sys/app-menu-add-or-update.vue
@@ -9,7 +9,6 @@
       :model="dataForm"
       :rules="dataRule"
       ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
       label-width="120px"
     >
       <el-form-item prop="type" :label="$t('menu.type')" size="mini">
@@ -22,18 +21,24 @@
         <el-input
           v-model="dataForm.name"
           :placeholder="$t('menu.name')"
+          maxlength="30"
+          show-word-limit
         ></el-input>
       </el-form-item>
       <el-form-item prop="menuCode" :label="$t('menu.menuCode')">
         <el-input
           v-model="dataForm.menuCode"
           :placeholder="$t('menu.menuCode')"
+          maxlength="30"
+          show-word-limit
         ></el-input>
       </el-form-item>
       <el-form-item prop="className" label="样式名称">
         <el-input
           v-model="dataForm.className"
           placeholder="样式名称"
+          maxlength="30"
+          show-word-limit
         ></el-input>
       </el-form-item>
       <el-form-item
@@ -124,7 +129,11 @@
         </el-select>
       </el-form-item>
       <el-form-item prop="remark" label="备注">
-        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+        <el-input v-model="dataForm.remark"
+                  type="text"
+                  maxlength="100"
+                  show-word-limit
+                   placeholder="备注"></el-input>
       </el-form-item>
       <el-form-item prop="numFlag"
                     label="是否显示数字"
diff --git a/src/views/modules/sys/app-menu.vue b/src/views/modules/sys/app-menu.vue
index bf3bed7..35ac248 100644
--- a/src/views/modules/sys/app-menu.vue
+++ b/src/views/modules/sys/app-menu.vue
@@ -4,7 +4,7 @@
       <el-form
         :inline="true"
         :model="dataForm"
-        @keyup.enter.native="getDataList()"
+        @keyup.enter.native="getDataListSearch()"
       >
         <el-form-item>
           <el-button
diff --git a/src/views/modules/sys/appmenutemplate-add-or-update.vue b/src/views/modules/sys/appmenutemplate-add-or-update.vue
index 6e9080a..215916b 100644
--- a/src/views/modules/sys/appmenutemplate-add-or-update.vue
+++ b/src/views/modules/sys/appmenutemplate-add-or-update.vue
@@ -9,31 +9,30 @@
       :model="dataForm"
       :rules="dataRule"
       ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
       :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"
     >
-      <el-form-item label="模板名称" prop="templateName">
+      <el-form-item label="模板名称" prop="templateName" label-width="100px">
         <el-input
           v-model="dataForm.templateName"
-          placeholder="模板名称"
+          placeholder="模板名称" maxlength="50"
         ></el-input>
       </el-form-item>
-      <el-form-item label="模板编码" prop="templateCode">
+      <el-form-item label="模板编码" prop="templateCode" label-width="100px">
         <el-input
           v-model="dataForm.templateCode"
-          placeholder="模板编码(tem-1,tem-2,tem-3)"
+          placeholder="模板编码(tem-1,tem-2,tem-3)" maxlength="50"
         ></el-input>
       </el-form-item>
-      <el-form-item label="CSS类名" prop="className">
-        <el-input v-model="dataForm.className" placeholder="CSS类名"></el-input>
+      <el-form-item label="CSS类名" prop="className" label-width="100px">
+        <el-input v-model="dataForm.className" placeholder="CSS类名" maxlength="50"></el-input>
       </el-form-item>
-      <el-form-item label="备用CSS类名" prop="spareClassName">
+      <el-form-item label="备用CSS类名" prop="spareClassName" label-width="100px">
         <el-input
           v-model="dataForm.spareClassName"
-          placeholder="备用CSS类名"
+          placeholder="备用CSS类名" maxlength="50"
         ></el-input>
       </el-form-item>
-      <el-form-item label="列数" prop="columnAmount">
+      <el-form-item label="列数" prop="columnAmount" label-width="100px">
         <el-input-number
           v-model="dataForm.columnAmount"
           controls-position="right"
@@ -42,10 +41,10 @@
           label="列数"
         ></el-input-number>
       </el-form-item>
-      <el-form-item label="背景颜色" prop="backgroundColor">
+      <el-form-item label="背景颜色" prop="backgroundColor" label-width="100px">
         <el-input
           v-model="dataForm.backgroundColor"
-          placeholder="背景颜色（渐变色为0时使用）"
+          placeholder="背景颜色（渐变色为0时使用）" maxlength="50"
         ></el-input>
       </el-form-item>
     </el-form>
diff --git a/src/views/modules/sys/appmenutemplate.vue b/src/views/modules/sys/appmenutemplate.vue
index 064a746..e3636b1 100644
--- a/src/views/modules/sys/appmenutemplate.vue
+++ b/src/views/modules/sys/appmenutemplate.vue
@@ -4,17 +4,18 @@
       <el-form
         :inline="true"
         :model="dataForm"
-        @keyup.enter.native="getDataList()"
+        @keyup.enter.native="getDataListSearch()"
       >
-        <el-form-item>
+        <el-form-item label="模板名称">
           <el-input
             v-model="dataForm.templateName"
             placeholder="模板名称"
+            @keyup.native="btKeyUpTemplateName"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button
@@ -45,36 +46,48 @@
           header-align="center"
           align="center"
           width="50"
+        ></el-table-column>
+         <el-table-column
+          type="index"
+          header-align="center"
+          align="center"
+          width="50"
+          label='序号'
         ></el-table-column>
         <el-table-column
           prop="templateName"
           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')"
@@ -150,6 +163,10 @@ export default {
         : row.state === '0'
           ? '未知'
           : '否'
+    },
+    btKeyUpTemplateName (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.TemplateName = e.target.value
     }
   }
 }
diff --git a/src/views/modules/sys/dict-add-or-update.vue b/src/views/modules/sys/dict-add-or-update.vue
index 3292949..ead1f21 100644
--- a/src/views/modules/sys/dict-add-or-update.vue
+++ b/src/views/modules/sys/dict-add-or-update.vue
@@ -1,20 +1,35 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="70px">
       <el-form-item prop="dictName" :label="$t('dict.dictName')">
-        <el-input v-model="dataForm.dictName" :placeholder="$t('dict.dictName')"></el-input>
+        <el-input v-model="dataForm.dictName"
+                  maxlength="50"
+                  show-word-limit
+                  :placeholder="$t('dict.dictName')"></el-input>
       </el-form-item>
       <el-form-item v-if="dataForm.pid === '0'" prop="dictType" :label="$t('dict.dictType')">
-        <el-input v-model="dataForm.dictType" :placeholder="$t('dict.dictType')"></el-input>
+        <el-input v-model="dataForm.dictType"
+                  maxlength="50"
+                  show-word-limit
+                  :placeholder="$t('dict.dictType')"></el-input>
       </el-form-item>
       <el-form-item v-if="dataForm.pid !== '0'" prop="dictValue" :label="$t('dict.dictValue')">
-        <el-input v-model="dataForm.dictValue" :placeholder="$t('dict.dictValue')"></el-input>
+        <el-input v-model="dataForm.dictValue"
+                  maxlength="50"
+                  show-word-limit
+                  :placeholder="$t('dict.dictValue')"></el-input>
       </el-form-item>
       <el-form-item prop="sort" :label="$t('dict.sort')">
-        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('dict.sort')"></el-input-number>
+        <el-input-number v-model="dataForm.sort"
+                         maxlength="50"
+                         show-word-limit
+                         controls-position="right" :min="0" :label="$t('dict.sort')"></el-input-number>
       </el-form-item>
       <el-form-item prop="remark" :label="$t('dict.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('dict.remark')"></el-input>
+        <el-input v-model="dataForm.remark"
+                  maxlength="100"
+                  show-word-limit
+                  :placeholder="$t('dict.remark')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/sys/dict.vue b/src/views/modules/sys/dict.vue
index 97f0004..6524fd6 100644
--- a/src/views/modules/sys/dict.vue
+++ b/src/views/modules/sys/dict.vue
@@ -4,24 +4,26 @@
     <div class="mod-sys__dict">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
-        <el-form-item>
+               @keyup.enter.native="getDataListSearch()">
+        <el-form-item label="名称">
           <el-input v-model="dataForm.dictName"
                     :placeholder="$t('dict.dictName')"
+                    @keyup.native="btKeyUpDictName"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item v-if="dataForm.pid === '0'">
+        <el-form-item v-if="dataForm.pid === '0'" label='类型'>
           <el-input v-model="dataForm.dictType"
                     :placeholder="$t('dict.dictType')"
+                    @keyup.native="btKeyUpDictType"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item v-if="dataForm.pid !== '0'">
+        <el-form-item v-if="dataForm.pid !== '0'" label='字典值'>
           <el-input v-model="dataForm.dictValue"
                     :placeholder="$t('dict.dictValue')"
                     clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type='success'>{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:dict:save')"
@@ -38,6 +40,13 @@
                 @selection-change="dataListSelectionChangeHandle"
                 @sort-change="dataListSortChangeHandle"
                 style="width: 100%;">
+                  <el-table-column
+          type="index"
+          header-align="center"
+          align="center"
+          width="50"
+          label='序号'
+        ></el-table-column>
         <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
         <el-table-column prop="dictName"
                          :label="$t('dict.dictName')"
@@ -134,16 +143,18 @@ export default {
   components: {
     AddOrUpdate
   },
-  activated () {
+  created: function () {
     // 通过路由参数pid, 控制列表请求操作
     this.dataForm.pid = this.$route.params.pid || '0'
     if (this.dataForm.pid !== '0') {
       this.mixinViewModuleOptions.getDataListURL = '/sys/dict/list'
       this.mixinViewModuleOptions.getDataListIsPage = false
-      this.dataForm.dictType = this.$route.params.type || ''
     }
     this.getDataList()
   },
+  activated(){
+    this.getDataList()
+  },
   methods: {
     // 子级
     childHandle (row) {
@@ -174,13 +185,30 @@ export default {
       window.SITE_CONFIG['dynamicRoutes'].push(route)
       this.$router.push({ name: route.name, params: { 'pid': row.id, 'type': row.dictType } })
     },
+    btKeyUpDictName (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.dictName = e.target.value
+    },
+    btKeyUpDictType (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.dictType = e.target.value
+    },
     // 新增 / 修改
     addOrUpdateHandle (row = {}) {
       this.addOrUpdateVisible = true
       this.$nextTick(() => {
+        var dictTypeSubStr = ''
+        if (this.dataForm.pid !== '0') {
+          var titleName = `${this.$route.meta.title}`
+          var startIndex = titleName.indexOf('- ') === -1 ? 0 : titleName.indexOf('- ')
+          dictTypeSubStr = titleName.substr(startIndex,titleName.length).replace('- ','')
+        }
         this.$refs.addOrUpdate.dataForm.id = row.id
         this.$refs.addOrUpdate.dataForm.pid = this.dataForm.pid
         this.$refs.addOrUpdate.dataForm.dictType = row.dictType || this.dataForm.dictType || ''
+        if (this.$refs.addOrUpdate.dataForm.dictType === null || this.$refs.addOrUpdate.dataForm.dictType === '') {
+          this.$refs.addOrUpdate.dataForm.dictType = dictTypeSubStr
+        }
         this.$refs.addOrUpdate.init()
       })
     }
diff --git a/src/views/modules/sys/menu-add-or-update.vue b/src/views/modules/sys/menu-add-or-update.vue
index aea2812..50aa08a 100644
--- a/src/views/modules/sys/menu-add-or-update.vue
+++ b/src/views/modules/sys/menu-add-or-update.vue
@@ -6,7 +6,6 @@
     <el-form :model="dataForm"
              :rules="dataRule"
              ref="dataForm"
-             @keyup.enter.native="dataFormSubmitHandle()"
              label-width="120px">
       <el-form-item prop="type"
                     :label="$t('menu.type')"
@@ -20,12 +19,16 @@
       <el-form-item prop="name"
                     :label="$t('menu.name')">
         <el-input v-model="dataForm.name"
+                  maxlength="30"
+                  show-word-limit
                   :placeholder="$t('menu.name')"></el-input>
       </el-form-item>
       <el-form-item v-if="dataForm.type === 0"
                     prop="menuCode"
                     :label="$t('menu.menuCode')">
         <el-input v-model="dataForm.menuCode"
+                  maxlength="50"
+                  show-word-limit
                   :placeholder="$t('menu.menuCode')"></el-input>
       </el-form-item>
       <el-form-item prop="parentName"
@@ -59,6 +62,8 @@
                     prop="url"
                     :label="$t('menu.url')">
         <el-input v-model="dataForm.url"
+                  maxlength="60"
+                  show-word-limit
                   :placeholder="$t('menu.url')"></el-input>
       </el-form-item>
       <el-form-item prop="sort"
diff --git a/src/views/modules/sys/menu.vue b/src/views/modules/sys/menu.vue
index 05744e2..534096a 100644
--- a/src/views/modules/sys/menu.vue
+++ b/src/views/modules/sys/menu.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__menu">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-button v-if="$hasPermission('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
diff --git a/src/views/modules/sys/params-add-or-update.vue b/src/views/modules/sys/params-add-or-update.vue
index df61ea8..ea7f6e5 100644
--- a/src/views/modules/sys/params-add-or-update.vue
+++ b/src/views/modules/sys/params-add-or-update.vue
@@ -1,14 +1,23 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm"  label-width="60px">
       <el-form-item prop="paramCode" :label="$t('params.paramCode')">
-        <el-input v-model="dataForm.paramCode" :placeholder="$t('params.paramCode')"></el-input>
+        <el-input v-model="dataForm.paramCode"
+                  maxlength="30"
+                  show-word-limit
+                  :placeholder="$t('params.paramCode')"></el-input>
       </el-form-item>
       <el-form-item prop="paramValue" :label="$t('params.paramValue')">
-        <el-input v-model="dataForm.paramValue" :placeholder="$t('params.paramValue')"></el-input>
+        <el-input v-model="dataForm.paramValue"
+                  maxlength="50"
+                  show-word-limit
+                  :placeholder="$t('params.paramValue')"></el-input>
       </el-form-item>
       <el-form-item prop="remark" :label="$t('params.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('params.remark')"></el-input>
+        <el-input v-model="dataForm.remark"
+                  maxlength="100"
+                  show-word-limit
+                  :placeholder="$t('params.remark')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/sys/params.vue b/src/views/modules/sys/params.vue
index 348db49..7fa8712 100644
--- a/src/views/modules/sys/params.vue
+++ b/src/views/modules/sys/params.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__params">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.paramCode" :placeholder="$t('params.paramCode')" clearable></el-input>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item label="编码">
+          <el-input v-model="dataForm.paramCode" :placeholder="$t('params.paramCode')" clearable @keyup.native="btKeyUpParamCode"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:params:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -17,9 +17,16 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="paramCode" :label="$t('params.paramCode')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="paramValue" :label="$t('params.paramValue')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="remark" :label="$t('params.remark')" header-align="center" align="center"></el-table-column>
+          <el-table-column
+          type="index"
+          header-align="center"
+          align="center"
+          width="50"
+          label='序号'
+        ></el-table-column>
+        <el-table-column prop="paramCode" :label="$t('params.paramCode')" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="paramValue" :label="$t('params.paramValue')" header-align="center" align="center" width="100"></el-table-column>
+        <el-table-column prop="remark" :label="$t('params.remark')" header-align="center" align="center" width="400" show-overflow-tooltip></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('sys:params:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@@ -62,6 +69,12 @@ export default {
   },
   components: {
     AddOrUpdate
+  },
+  methods: {
+    btKeyUpParamCode (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.paramCode = e.target.value
+    }
   }
 }
 </script>
diff --git a/src/views/modules/sys/resource-add-or-update.vue b/src/views/modules/sys/resource-add-or-update.vue
index e539303..9e55782 100644
--- a/src/views/modules/sys/resource-add-or-update.vue
+++ b/src/views/modules/sys/resource-add-or-update.vue
@@ -9,25 +9,25 @@
       :model="dataForm"
       :rules="dataRule"
       ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
       label-width="120px"
     >
       <el-form-item prop="resourceLabel" label="资源标签">
         <el-input
           v-model="dataForm.resourceLabel"
-          placeholder="请输入资源标签"
+          placeholder="请输入资源标签" maxlength="128"
         ></el-input>
       </el-form-item>
       <el-form-item prop="resourceType" label="资源类型">
         <el-input
           v-model="dataForm.resourceType"
-          placeholder="请输入资源类型"
+          placeholder="请输入资源类型" maxlength="32"
         ></el-input>
       </el-form-item>
       <el-form-item prop="resourceCode" label="资源编码">
         <el-input
                 v-model="dataForm.resourceCode"
-                placeholder="请输入资源编码"
+                placeholder="请输入资源编码" maxlength="32"
+                show-word-limit
         ></el-input>
       </el-form-item>
 
@@ -78,7 +78,7 @@
       </el-form-item>
 
       <el-form-item prop="totalDescribe" label="统计描述">
-        <el-input v-model="dataForm.totalDescribe" placeholder="统计描述"></el-input>
+        <el-input v-model="dataForm.totalDescribe" placeholder="统计描述" maxlength="1024"></el-input>
         <font color="gray">需要在动词前用{0}进行间隔！例：学校{0}组织春游。</font>
       </el-form-item>
       <el-form-item prop="showFlag"
@@ -183,6 +183,7 @@ export default {
         this.$refs['dataForm'].resetFields()
         this.dataForm.parentName = '一级资源'
         this.dataForm.resourceList = []
+        this.buttonFlag = false
         this.getResourceList().then(() => {
           if (this.dataForm.id) {
             this.getInfo()
@@ -249,8 +250,8 @@ export default {
             .then(({ data: res }) => {
               if (res.code !== 0) {
                 return this.$message.error(res.msg)
+                this.buttonFlag = true
               }
-              this.buttonFlag = false
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
diff --git a/src/views/modules/sys/resources-list.vue b/src/views/modules/sys/resources-list.vue
index f7c7a6a..3599fe9 100644
--- a/src/views/modules/sys/resources-list.vue
+++ b/src/views/modules/sys/resources-list.vue
@@ -4,7 +4,7 @@
       <el-form
         :inline="true"
         :model="dataForm"
-        @keyup.enter.native="getDataList()"
+        @keyup.enter.native="getDataListSearch()"
       >
         <el-form-item>
           <el-button
@@ -31,12 +31,14 @@
           label="资源编码"
           header-align="center"
           align="center"
+          show-overflow-tooltip
         ></el-table-column>
         <el-table-column
                 prop="resourceType"
                 label="资源类型"
                 header-align="center"
                 align="center"
+                show-overflow-tooltip
         ></el-table-column>
         <el-table-column
                 prop="sort"
diff --git a/src/views/modules/sys/resourcestotalrelation-list.vue b/src/views/modules/sys/resourcestotalrelation-list.vue
index 7f192e5..b745eb8 100644
--- a/src/views/modules/sys/resourcestotalrelation-list.vue
+++ b/src/views/modules/sys/resourcestotalrelation-list.vue
@@ -7,13 +7,13 @@
   >
     <el-card shadow="never" class="aui-card--fill">
       <div class="mod-news__resourcestotalrelation}">
-        <el-form :inline="true" :model="dataForm" @keyup.enter.native="selectData()">
+        <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
             <div>
                 <el-form-item label="统计名称" prop="totalName">
-                    <el-input v-model="dataForm.totalName" placeholder="统计名称" clearable></el-input>
+                    <el-input v-model="dataForm.totalName" placeholder="统计名称" clearable @keyup.native="btKeyUpTotalName"></el-input>
                 </el-form-item>
                 <el-form-item label="统计类型" prop="totalType">
-                    <el-input v-model="dataForm.totalType" placeholder="统计类型" clearable></el-input>
+                    <el-input v-model="dataForm.totalType" placeholder="统计类型" clearable @keyup.native="btKeyUpTotalType"></el-input>
                 </el-form-item>
             </div>
             <div>
@@ -31,7 +31,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item>
-                    <el-button @click="selectData()">{{ $t('query') }}</el-button>
+                    <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
                 </el-form-item>
                 <el-form-item>
                     <el-button v-if="$hasPermission('workRecord:relation:save')" type="primary" @click="selectHandle()">{{ "新增" }}</el-button>
@@ -47,8 +47,8 @@
             </template>
           </el-table-column>
           <el-table-column prop="totalName" label="统计名称" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="totalType" label="统计类型" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="totalStyle" label="统计方式" :formatter="totalStyleFormatter" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="totalType" label="统计类型" header-align="center" align="center" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="totalStyle" label="统计方式" :formatter="totalStyleFormatter" header-align="center" align="center" show-overflow-tooltip></el-table-column>
           <el-table-column prop="spec" label="规格" header-align="center" align="center"></el-table-column>
           <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
           <el-table-column prop="autoFlag" label="是否自动计算" :formatter="autoFlagFormatter" header-align="center" align="center"></el-table-column>
@@ -104,12 +104,24 @@ export default {
   methods: {
     init () {
       this.visible = true
+      this.dataForm.totalName = ''
+      this.dataForm.totalType = ''
+      this.dataForm.totalStyle = ''
+      this.dataForm.autoFlag = ''
       this.$nextTick(() => {
         if (this.dataForm.resourceId) {
           this.getDataList()
         }
       })
     },
+    btKeyUpTotalName (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.totalName = e.target.value
+    },
+    btKeyUpTotalType (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.totalType = e.target.value
+    },
     selectData(){
         this.page = 1
         this.getDataList()
diff --git a/src/views/modules/sys/totalconfig-add-or-update.vue b/src/views/modules/sys/totalconfig-add-or-update.vue
index cbf53e3..7270a91 100644
--- a/src/views/modules/sys/totalconfig-add-or-update.vue
+++ b/src/views/modules/sys/totalconfig-add-or-update.vue
@@ -1,21 +1,30 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
         <el-form-item label="统计名称" prop="totalName">
-            <el-input v-model="dataForm.totalName" placeholder="统计名称"></el-input>
+            <el-input v-model="dataForm.totalName"
+                      maxlength="64"
+                      show-word-limit
+                      placeholder="统计名称"></el-input>
         </el-form-item>
         <el-form-item label="统计类型" prop="totalType">
-          <el-input v-model="dataForm.totalType" placeholder="统计类型（自定义）"></el-input>
+          <el-input v-model="dataForm.totalType"
+                    maxlength="32"
+                    show-word-limit
+                    placeholder="统计类型（自定义）"></el-input>
         </el-form-item>
         <el-form-item label="统计方式" prop="totalStyle">
-            <el-select v-model="dataForm.totalStyle" placeholder="统计方式" clearable>
+            <el-select v-model="dataForm.totalStyle" placeholder="统计方式" clearable style="width:200px">
                 <el-option label="其他" :value="0"></el-option>
                 <el-option label="统计次数" :value="1"></el-option>
                 <el-option label="统计人数" :value="2"></el-option>
             </el-select>
         </el-form-item>
         <el-form-item label="统计规格" prop="spec">
-            <el-input v-model="dataForm.spec" placeholder="统计规格"></el-input>
+            <el-input v-model="dataForm.spec"
+                      maxlength="32"
+                      show-word-limit
+                      placeholder="统计规格"></el-input>
         </el-form-item>
         <el-form-item prop="sort" label="排序">
             <el-input-number
@@ -23,6 +32,7 @@
                     controls-position="right"
                     :min="0"
                     label="排序"
+                    style="width:200px"
             ></el-input-number>
         </el-form-item>
         <el-form-item prop="autoFlag"
diff --git a/src/views/modules/sys/totalconfig-list.vue b/src/views/modules/sys/totalconfig-list.vue
index 16f4c71..11e46ce 100644
--- a/src/views/modules/sys/totalconfig-list.vue
+++ b/src/views/modules/sys/totalconfig-list.vue
@@ -1,13 +1,13 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__totalconfig}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="selectData()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
           <el-form-item label="统计名称" prop="totalName">
-            <el-input v-model="dataForm.totalName" placeholder="统计名称" clearable></el-input>
+            <el-input v-model="dataForm.totalName" @keyup.native="btKeyUpTotalName" placeholder="统计名称" clearable></el-input>
           </el-form-item>
           <el-form-item label="统计类型" prop="totalType">
-            <el-input v-model="dataForm.totalType" placeholder="统计类型" clearable></el-input>
+            <el-input v-model="dataForm.totalType" @keyup.native="btKeyUpTotalType" placeholder="统计类型" clearable></el-input>
           </el-form-item>
         </div>
         <div>
@@ -25,7 +25,7 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button @click="selectData()">{{ $t('query') }}</el-button>
+            <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
           </el-form-item>
           <el-form-item>
             <el-button v-if="$hasPermission('workRecord:totalconfig:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -38,14 +38,14 @@
                 {{scope.$index+1}}
             </template>
         </el-table-column>
-        <el-table-column prop="totalName" label="统计名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="totalType" label="统计类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="totalStyle" label="统计方式" :formatter="totalStyleFormatter" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="spec" label="规格" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="autoFlag" label="是否自动计算" :formatter="autoFlagFormatter" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mustFlag" label="是否必须输入" :formatter="mustFlagFormatter" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="totalName" label="统计名称" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="totalType" label="统计类型" header-align="center" align="center" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="totalStyle" label="统计方式" :formatter="totalStyleFormatter" header-align="center" align="center" width="150"></el-table-column>
+        <el-table-column prop="spec" label="规格" header-align="center" align="center" width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="sort" label="排序" header-align="center" align="center" width="90"></el-table-column>
+        <el-table-column prop="autoFlag" label="是否自动计算" :formatter="autoFlagFormatter" header-align="center" align="center" width="150"></el-table-column>
+        <el-table-column prop="mustFlag" label="是否必须输入" :formatter="mustFlagFormatter" header-align="center" align="center" width="150"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('workRecord:totalconfig:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@@ -108,9 +108,13 @@ export default {
         return '是'
       }
     },
-    selectData(){
-      this.page = 1
-      this.getDataList()
+    btKeyUpTotalName (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.totalName = e.target.value
+    },
+    btKeyUpTotalType (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.totalType = e.target.value
     },
     totalStyleFormatter: function (row, column) {
       if (row.totalStyle === 0) {