Merge branch 'master' into demo1

src/views/monitor/errorLog/index.vue

@@ -55,6 +55,7 @@
           v-hasPermi="['zt:errlog:export']"
           type="success"
           size="small"
+          :disabled="list.length === 0"
           @click="handleExport"
         >导出</el-button>
         <!--          <el-button size="small" @click="resetQuery">重置</el-button>-->

src/views/monitor/loginInfo/index.vue

@@ -71,6 +71,7 @@
           <el-button
             type="success"
             size="small"
+            :disabled="list.length === 0"
             @click="handleExport"
           >导出</el-button>
           <!--          <el-button size="mini" @click="resetQuery">重置</el-button>-->
@@ -87,7 +88,11 @@
         <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
         <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
         <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />
-        <el-table-column label="提示信息" align="center" prop="msg" />
+        <el-table-column label="提示信息" align="center" prop="msg" >
+          <template slot-scope="scope">
+            <span>{{ scope.row.msg || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="登录时间" align="center" prop="loginTime" width="180" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.loginTime) | transformDateByFormat('YYYY-MM-DD HH:mm:ss') }}</span>

src/views/monitor/operLog/index.vue

@@ -55,6 +55,7 @@
           v-hasPermi="['zt:operLog:export']"
           type="success"
           size="small"
+          :disabled="list.length === 0"
           @click="handleExport"
         >导出</el-button>
         <!--          <el-button size="small" @click="resetQuery">重置</el-button>-->

src/views/system/dept/index.vue

@@ -167,7 +167,7 @@ export default {
         if (stuCardReg.test(value)) {
           callback()
         } else {
-          callback(new Error('请输入正确的手机号码'))
+          callback(new Error('请输入正确的联系电话'))
         }
       }
     }
@@ -188,7 +188,7 @@ export default {
       // 状态数据字典
       statusOptions: [
         {
-          dictLabel: '正常',
+          dictLabel: '启用',
           dictValue: '1'
         },
         {

src/views/system/dict/index.vue

@@ -26,7 +26,7 @@
       <el-form-item label="状态" prop="flag">
         <el-select
           v-model="queryParams.flag"
-          placeholder="请选择"
+          placeholder="请选择状态"
           clearable
           size="small"
           style="width: 200px"
@@ -330,7 +330,7 @@ export default {
       // 状态数据字典
       statusOptions: [
         {
-          dictLabel: '正常',
+          dictLabel: '启用',
           dictValue: '1'
         },
         {

src/views/system/menu/index.vue

@@ -302,7 +302,7 @@ export default {
       // 菜单状态数据字典
       statusOptions: [
         {
-          dictLabel: '正常',
+          dictLabel: '启用',
           dictValue: '1'
         },
         {

src/views/system/post/index.vue

@@ -203,7 +203,7 @@
               :key="dict.dictValue"
               :label="dict.dictValue"
             >{{ dict.dictLabel }}
-              <!--                          <el-radio label="0">正常</el-radio>-->
+              <!--                          <el-radio label="0">启用</el-radio>-->
               <!--                          <el-radio label="1">停用</el-radio>-->
             </el-radio>
           </el-radio-group>

src/views/system/role/index.vue

@@ -143,7 +143,7 @@
           <el-input v-model.trim="form.roleKey" show-word-limit :maxlength="30" placeholder="请输入权限字符" />
         </el-form-item>
         <el-form-item label="角色排序" prop="roleSort">
-          <el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" :max="9999"/>
+          <el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" :max="9999" placeholder="请输入角色排序"/>
         </el-form-item>
         <el-form-item label="角色状态">
           <el-radio-group v-model="form.flag">

src/views/system/user/index.vue

@@ -406,7 +406,7 @@ export default {
         if (stuCardReg.test(value)) {
           callback()
         } else {
-          callback(new Error('请输入正确的手机号码'))
+          callback(new Error('请输入正确的联系电话'))
         }
       }
     }
@@ -624,7 +624,7 @@ export default {
         //   { required: false, message: '请输入手机号码', trigger: 'blur' },
         //   {
         //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-        //     message: '请输入正确的手机号码',
+        //     message: '请输入正确的联系电话',
         //     trigger: 'blur'
         //   },
         //   { validator: phone, trigger: 'blur' }

src/views/system/user/profile/userInfo.vue

@@ -51,7 +51,7 @@ export default {
           { required: true, message: '手机号码不能为空', trigger: 'blur' },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: '请输入正确的手机号码',
+            message: '请输入正确的联系电话',
             trigger: 'blur'
           }
         ]