Merge branch 'master' into demo1

src/api/system/dict/data.js

@@ -73,11 +73,11 @@ export function delData(dictCode) {
 }
 
 // 导出字典数据
-export function exportData(query) {
+export function exportData(params) {
   return request({
-    url: '/system/dict/data/export/' + query.dictType,
+    url: '/system/dict/data/export',
     method: 'get',
-    params: query,
+    params,
     responseType: 'blob'
   })
 }

src/permission.js

@@ -59,7 +59,12 @@ router.beforeEach((to, from, next) => {
             })
           })
       } else {
-        next()
+        if (store.state.tagsView.visitedViews.length === 10) {
+          Message.error('您操作的页面较多，请先关闭部分页面')
+          NProgress.done()
+        } else {
+          next()
+        }
         // 没有动态改变权限的需求可直接next() 删除下方权限判断 ↓
         // if (hasPermission(store.getters.roles, to.meta.roles)) {
         //   next()

src/views/monitor/loginInfo/index.vue

@@ -195,7 +195,7 @@ export default {
       switch (row) {
         case '1' :
           return '成功'
-        case '2' :
+        case '0' :
           return '失败'
       }
     },

src/views/system/dict/data.vue

@@ -151,7 +151,7 @@
           <el-input v-model.trim="form.dictLabel" show-word-limit maxlength="30" placeholder="请输入参数标签" />
         </el-form-item>
         <el-form-item label="参数键值" prop="dictValue">
-          <el-input v-model.trim="form.dictValue" show-word-limit maxlength="300" placeholder="请输入参数键值" />
+          <el-input v-model.trim="form.dictValue" show-word-limit maxlength="40" placeholder="请输入参数键值" />
         </el-form-item>
         <el-form-item label="参数排序" prop="dictSort">
           <el-input-number v-model="form.dictSort" style="width: 100%" controls-position="right" :min="0" />
@@ -424,13 +424,15 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams
+      const params = {
+        dictType: this.queryParams.dictType
+      }
       this.$confirm('是否确认导出所有数据项?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(function() {
-        return exportData(queryParams).then(response => {
+      }).then(() => {
+        exportData(params).then(response => {
           const blob = new Blob([response])
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob)// 创建下载的链接

src/views/system/dict/index.vue

@@ -194,7 +194,7 @@
 <!--          </el-radio-group>-->
         </el-form-item>
         <el-form-item label="父字典名称">
-          <el-select v-model="form.parentId" style="width: 100%" clearable placeholder="请选择父字典" @change="getOptions">
+          <el-select v-model="form.parentId" style="width: 100%" clearable placeholder="请选择父字典名称" @change="getOptions">
             <el-option
               v-for="item in options"
               :key="item.businessId"