فهرست منبع

修改弹出框,删除按钮,提示语样式

DESKTOP-227F4HN\Zt 2 سال پیش
والد
کامیت
540065e395

+ 6 - 0
chuanyi-admin/src/App.vue

@@ -18,4 +18,10 @@ export default {
   float: right;
   margin-left: 10px !important;
 }
+.el-icon-delete{
+  color:red
+}
+.el-icon-delete+span{
+  color:red
+}
 </style>

+ 1 - 1
chuanyi-admin/src/components/ErrorLog/index.vue

@@ -6,7 +6,7 @@
       </el-button>
     </el-badge>
 
-    <el-dialog :visible.sync="dialogTableVisible" width="80%" append-to-body>
+    <el-dialog :visible.sync="dialogTableVisible" width="80%" append-to-body :close-on-click-modal="false">
       <div slot="title">
         <span style="padding-right: 10px;">Error Log</span>
         <el-button size="mini" type="primary" icon="el-icon-delete" @click="clearAll">Clear All</el-button>

+ 1 - 1
chuanyi-admin/src/components/Tinymce/components/EditorImage.vue

@@ -3,7 +3,7 @@
     <el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
       upload
     </el-button>
-    <el-dialog :visible.sync="dialogVisible">
+    <el-dialog :visible.sync="dialogVisible" :close-on-click-modal="false">
       <el-upload
         :multiple="true"
         :file-list="fileList"

+ 1 - 1
chuanyi-admin/src/layout/components/Navbar.vue

@@ -38,7 +38,7 @@
         </el-dropdown-menu>
       </el-dropdown>
 
-      <el-dialog title="修改密码" :visible.sync="dialogVisible" width="30%">
+      <el-dialog title="修改密码" :visible.sync="dialogVisible" width="30%" :close-on-click-modal="false">
         <el-form ref="psdForm" :model="form" :rules="rules" :inline="true" label-width="150px">
           <el-form-item label="请输入旧密码" prop="password">
             <el-input v-model="form.password" style="width:300px" clearable />

+ 1 - 0
chuanyi-admin/src/store/modules/permission.js

@@ -14,6 +14,7 @@ function getRoute(item) {
     path: item.url,
     // 路由名
     name: item.label,
+    hidden: false,
     meta: {
       id: item.id,
       title: item.label,

+ 130 - 101
chuanyi-admin/src/utils/request.js

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { Notification, MessageBox, Message } from 'element-ui'
+import { MessageBox, Message } from 'element-ui'
 import { getToken, removeAll } from '@/utils/auth'
 import cache from '@/plugins/cache'
 import errorCode from '@/utils/errorCode'
@@ -22,119 +22,148 @@ const service = axios.create({
 })
 
 // request interceptor
-service.interceptors.request.use(config => {
-  // 是否需要设置 token
-  const isToken = (config.headers || {}).isToken === false
-  // 是否需要防止数据重复提交
-  const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
-  if (getToken() && !isToken) {
-    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-    config.headers['token'] = getToken()
-  }
-  // get请求映射params参数
-  if (config.method === 'get' && config.params) {
-    let url = config.url + '?' + tansParams(config.params)
-    url = url.slice(0, -1)
-    config.params = {}
-    config.url = url
-  }
-  if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
-    const requestObj = {
-      url: config.url,
-      data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
-      time: new Date().getTime()
+service.interceptors.request.use(
+  (config) => {
+    // 是否需要设置 token
+    const isToken = (config.headers || {}).isToken === false
+    // 是否需要防止数据重复提交
+    const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
+    if (getToken() && !isToken) {
+      config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+      config.headers['token'] = getToken()
     }
-    const sessionObj = cache.session.getJSON('sessionObj')
-    if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
-      cache.session.setJSON('sessionObj', requestObj)
-    } else {
-      const s_url = sessionObj.url // 请求地址
-      const s_data = sessionObj.data // 请求数据
-      const s_time = sessionObj.time // 请求时间
-      const interval = 1000 // 间隔时间(ms),小于此时间视为重复提交
-      if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
-        const message = errorCode[901]
-        console.warn(`[${s_url}]: ` + message)
-        return Promise.reject(new Error(message))
-      } else {
+    // get请求映射params参数
+    if (config.method === 'get' && config.params) {
+      let url = config.url + '?' + tansParams(config.params)
+      url = url.slice(0, -1)
+      config.params = {}
+      config.url = url
+    }
+    if (
+      !isRepeatSubmit &&
+      (config.method === 'post' || config.method === 'put')
+    ) {
+      const requestObj = {
+        url: config.url,
+        data:
+          typeof config.data === 'object'
+            ? JSON.stringify(config.data)
+            : config.data,
+        time: new Date().getTime()
+      }
+      const sessionObj = cache.session.getJSON('sessionObj')
+      if (
+        sessionObj === undefined ||
+        sessionObj === null ||
+        sessionObj === ''
+      ) {
         cache.session.setJSON('sessionObj', requestObj)
+      } else {
+        const s_url = sessionObj.url // 请求地址
+        const s_data = sessionObj.data // 请求数据
+        const s_time = sessionObj.time // 请求时间
+        const interval = 1000 // 间隔时间(ms),小于此时间视为重复提交
+        if (
+          s_data === requestObj.data &&
+          requestObj.time - s_time < interval &&
+          s_url === requestObj.url
+        ) {
+          const message = errorCode[901]
+          console.warn(`[${s_url}]: ` + message)
+          return Promise.reject(new Error(message))
+        } else {
+          cache.session.setJSON('sessionObj', requestObj)
+        }
       }
     }
+    return config
+  },
+  (error) => {
+    // do something with request error
+    console.log(error) // for debug
+    return Promise.reject(error)
   }
-  return config
-}, error => {
-  // do something with request error
-  console.log(error) // for debug
-  return Promise.reject(error)
-})
+)
 
 // response interceptor
-service.interceptors.response.use(res => {
-  // 未设置状态码则默认成功状态
-  const code = res.data.code || 200
-  // 获取错误信息
-  const msg = errorCode[code] || res.data.msg || errorCode['default']
-  // 二进制数据则直接返回
-  if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
-    return res.data
-  }
-  if (code === 401) {
-    if (!isRelogin.show) {
-      isRelogin.show = true
-      MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', {
-        confirmButtonText: '重新登录',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        isRelogin.show = false
-        logout().then(res => {
-          removeAll()
-          location.href = '/index'
-        })
-      }).catch(() => {
-        isRelogin.show = false
-      })
+service.interceptors.response.use(
+  (res) => {
+    // 未设置状态码则默认成功状态
+    const code = res.data.code || 200
+    // 获取错误信息
+    const msg = errorCode[code] || res.data.msg || errorCode['default']
+    // 二进制数据则直接返回
+    if (
+      res.request.responseType === 'blob' ||
+      res.request.responseType === 'arraybuffer'
+    ) {
+      return res.data
     }
-    return Promise.reject('无效的会话,或者会话已过期,请重新登录。')
-  } else if (code === 500) {
-    Message({
-      message: msg,
-      type: 'error'
-    })
-    return Promise.reject(new Error(msg))
-  } else if (code === 402) {
-    const roles = store.getters.roles
-    if (!roles.length) {
+    if (code === 401) {
+      if (!isRelogin.show) {
+        isRelogin.show = true
+        MessageBox.confirm(
+          '登录状态已过期,您可以继续留在该页面,或者重新登录',
+          '系统提示',
+          {
+            confirmButtonText: '重新登录',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        )
+          .then(() => {
+            isRelogin.show = false
+            logout().then((res) => {
+              removeAll()
+              location.href = '/index'
+            })
+          })
+          .catch(() => {
+            isRelogin.show = false
+          })
+      }
+      return Promise.reject('无效的会话,或者会话已过期,请重新登录。')
+    } else if (code === 500) {
+      Message({
+        message: msg,
+        type: 'error'
+      })
+      return Promise.reject(new Error(msg))
+    } else if (code === 402) {
+      const roles = store.getters.roles
+      if (!roles.length) {
+        Message({
+          message: '请使用管理人员账号登录',
+          type: 'error'
+        })
+        router.replace({ path: '/login' })
+      }
+    } else if (code !== 200) {
       Message({
-        message: '请使用管理人员账号登录',
+        message: msg,
         type: 'error'
       })
-      router.replace({ path: '/login' })
+      return Promise.reject(new Error(res.data.msg))
+    } else {
+      return res.data
+    }
+  },
+  (error) => {
+    let { message } = error
+    if (message === 'Network Error') {
+      message = errorCode[904]
+    } else if (message.includes('timeout')) {
+      message = errorCode[905]
+    } else if (message.includes('Request failed with status code')) {
+      message = '系统接口' + message.substr(message.length - 3) + '异常'
     }
-  } else if (code !== 200) {
-    console.log(code)
-    Notification.error({
-      title: msg
+    Message({
+      message: message,
+      type: 'error',
+      duration: 5 * 1000
     })
-    return Promise.reject(new Error(res.data.msg))
-  } else {
-    return res.data
-  }
-}, error => {
-  let { message } = error
-  if (message === 'Network Error') {
-    message = errorCode[904]
-  } else if (message.includes('timeout')) {
-    message = errorCode[905]
-  } else if (message.includes('Request failed with status code')) {
-    message = '系统接口' + message.substr(message.length - 3) + '异常'
+    return Promise.reject(error)
   }
-  Message({
-    message: message,
-    type: 'error',
-    duration: 5 * 1000
-  })
-  return Promise.reject(error)
-})
+)
 
 export default service

+ 1 - 1
chuanyi-admin/src/views/system/auth/index.vue

@@ -43,7 +43,7 @@
     </el-row>
 
     <!-- 弹出框 -->
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="35%">
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="35%" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">

+ 6 - 0
chuanyi-admin/src/views/system/demo/index.vue

@@ -0,0 +1,6 @@
+<template>
+  <div>
+    123
+  </div>
+</template>
+

+ 1 - 0
chuanyi-admin/src/views/system/dept/index.vue

@@ -135,6 +135,7 @@
       :title="title"
       :visible.sync="dialogVisible"
       width="35%"
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form"

+ 1 - 1
chuanyi-admin/src/views/system/dict/dict-detail.vue

@@ -68,7 +68,7 @@
     </el-row>
 
     <!-- 弹出框 -->
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="35%" append-to-body>
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="35%" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24">

+ 1 - 0
chuanyi-admin/src/views/system/dict/index.vue

@@ -147,6 +147,7 @@
       :visible.sync="dialogVisible"
       width="35%"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form"

+ 1 - 0
chuanyi-admin/src/views/system/menu/index.vue

@@ -144,6 +144,7 @@
       :title="title"
       :visible.sync="dialogVisible"
       width="800px"
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form"

+ 1 - 0
chuanyi-admin/src/views/system/menu/menu-dist.vue

@@ -6,6 +6,7 @@
     width="50%"
     top="10vh"
     append-to-body
+    :close-on-click-modal="false"
   >
     <el-row>
       <el-col>

+ 1 - 1
chuanyi-admin/src/views/system/role/index.vue

@@ -102,7 +102,7 @@
     </el-row>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col>

+ 6 - 5
chuanyi-admin/src/views/system/role/user-auth.vue

@@ -122,11 +122,12 @@ export default {
     /** 用户类型转换 */
     convertUserType(val) {
       let result = ''
-      this.userType.forEach((e) => {
-        if (e.value === val) {
-          result = e.name
-        }
-      })
+      // this.userType.forEach((e) => {
+      //   if (e.value === val) {
+      //     result = e.name
+      //   }
+      // })
+      val === 0 ? result = '客户端用户' : result = '管理用户'
       return result
     },
     /** 查询授权用户列表 */

+ 1 - 0
chuanyi-admin/src/views/system/role/user-menu.vue

@@ -94,6 +94,7 @@
       title="分配菜单"
       :visible.sync="dialogVisible"
       width="35%"
+      :close-on-click-modal="false"
     >
       <el-row>
         <el-col>

+ 1 - 1
chuanyi-admin/src/views/system/role/user-select.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 授权用户 -->
-  <el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
+  <el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body :close-on-click-modal="false">
     <el-form ref="queryForm" :model="queryParams" size="small" :inline="true">
       <el-form-item label="用户名称" prop="userName">
         <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter.native="handleQuery" />

+ 10 - 5
chuanyi-admin/src/views/system/user/index.vue

@@ -208,6 +208,7 @@
       :visible.sync="open"
       width="600px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form"
@@ -383,11 +384,12 @@ export default {
     /** 用户类型转换 */
     convertUserType(val) {
       let result = ''
-      this.userType.forEach((e) => {
-        if (e.value === val) {
-          result = e.name
-        }
-      })
+      // this.userType.forEach((e) => {
+      //   if (e.value === val) {
+      //     result = e.name
+      //   }
+      // })
+      val === 0 ? result = '客户端用户' : result = '管理用户'
       return result
     },
     /** 查询用户列表 */
@@ -416,6 +418,7 @@ export default {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           cancelButtonClass: 'btn_custom_cancel',
+          closeOnClickModal: false,
           type: 'warning'
         }).then(() => {
           for (const i in userIdList) {
@@ -444,6 +447,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         cancelButtonClass: 'btn_custom_cancel',
+        closeOnClickModal: false,
         type: 'warning'
       }).then(() => {
         delUserById({
@@ -471,6 +475,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         cancelButtonClass: 'btn_custom_cancel',
+        closeOnClickModal: false,
         type: 'warning'
       }).then(() => {
         const data = this.$store.dispatch('user/ResetPassword', {