Merge branch 'dev_372'

ZR.Vue/src/api/system/dict/data.js

@@ -19,10 +19,18 @@ export function getData(dictCode) {
 
 // 根据字典类型查询字典数据信息
 export function getDicts(dictType) {
-  return request({
-    url: '/system/dict/data/type/' + dictType,
-    method: 'get'
-  })
+  if (typeof (dictType) === "object") {
+    return request({
+      url: '/system/dict/data/types',
+      data: dictType,
+      method: 'post'
+    })
+  } else {
+    return request({
+      url: '/system/dict/data/type/' + dictType,
+      method: 'get'
+    })
+  }
 }
 
 // 新增字典数据
@@ -58,4 +66,4 @@ export function exportData(query) {
     method: 'get',
     params: query
   })
-}
+}

ZR.Vue/src/api/tool/gen.js

@@ -9,8 +9,8 @@ import request from '@/utils/request'
 // }
 
 /**
-   * 创建数据库连接
-   */
+ * 创建数据库连接
+ */
 // export function createGetDBConn(data) {
 //   return request({
 //     url: 'tool/gen/CreateDBConn',
@@ -19,8 +19,8 @@ import request from '@/utils/request'
 //   })
 // }
 /**
-   * 获取数据库
-   */
+ * 获取数据库
+ */
 export function codeGetDBList() {
   return request({
     url: 'tool/gen/getDbList',
@@ -28,8 +28,8 @@ export function codeGetDBList() {
   })
 }
 /**
-   * 获取数据库表
-   */
+ * 获取数据库表
+ */
 export function listDbTable(data) {
   return request({
     url: 'tool/gen/getTableList',
@@ -38,8 +38,8 @@ export function listDbTable(data) {
   })
 }
 /**
-   * 生成代码
-   */
+ * 生成代码
+ */
 export async function codeGenerator(data) {
   return await request({
     url: 'tool/gen/genCode',
@@ -60,15 +60,23 @@ export function queryColumnInfo(tableId) {
   })
 }
 
-
-// 查询表详细信息
-export function getGenTable(params) {
+// 查询生成表数据
+export function listTable(params) {
   return request({
-    url: 'tool/gen/listGenTable',
+    url: 'tool/gen/list',
     method: 'get',
     params: params
   })
 }
+
+// 查询表详细信息
+export function getGenTable(tableId) {
+  return request({
+    url: '/tool/gen/' + tableId,
+    method: 'get'
+  })
+}
+
 // 导入表
 export function importTable(data) {
   return request({
@@ -99,28 +107,15 @@ export function previewTable(tableId, data) {
   return request({
     url: '/tool/gen/preview/' + tableId,
     method: 'post',
-		data: data
+    data: data
   })
 }
 
-// /**
-//  *
-// * 数据库解密
-// */
-// export function dbtoolsConnStrDecrypt(data) {
-//   return request({
-//     url: 'DbTools/ConnStrDecrypt',
-//     method: 'post',
-//     params: data,
-//   })
-// }
-// /**
-//    * 数据库加密
-//    */
-// export function dbtoolsConnStrEncrypt(data) {
-//   return request({
-//     url: 'DbTools/ConnStrEncrypt',
-//     method: 'post',
-//     params: data,
-//   })
-// }
+// 同步数据库
+export function synchDb(tableId, data) {
+  return request({
+    url: '/tool/gen/synchDb/' + tableId,
+    method: 'get',
+		params: data
+  })
+}

ZR.Vue/src/components/DateRangePicker/index.vue

@@ -1,45 +0,0 @@
-<script>
-import { DatePicker, DatePickerOptions } from 'element-ui'
-import { calendarShortcuts } from '@/utils/shortcuts'
-
-export default {
-  name: 'DateRangePicker',
-  mixins: [DatePicker],
-  props: {
-    type: {
-      type: String,
-      default: 'daterange'
-    },
-    valueFormat: {
-      type: String,
-      default: 'yyyy-MM-dd HH:mm:ss'
-    },
-    defaultTime: {
-      type: Array,
-      default: _ => ['00:00:00', '23:59:59']
-    },
-    pickerOptions: {
-      type: DatePickerOptions,
-      default: _ => {
-        return { shortcuts: calendarShortcuts }
-      }
-    },
-    size: {
-      type: String,
-      default: 'small'
-    },
-    rangeSeparator: {
-      type: String,
-      default: ':'
-    },
-    startPlaceholder: {
-      type: String,
-      default: '开始日期'
-    },
-    endPlaceholder: {
-      type: String,
-      default: '结束日期'
-    }
-  }
-}
-</script>

ZR.Vue/src/components/FileUpload/index.vue

@@ -144,10 +144,12 @@ export default {
     },
     // 上传成功回调
     handleUploadSuccess(res, file) {
+      if (res.code != 200) {
+        this.msgError(`上传失败，原因:${res.msg}!`);
+        return;
+      }
       this.msgSuccess("上传成功");
-      console.log(res.data.fileName, res.data.url);
       this.fileList.push({ name: res.data.fileName, url: res.data.url });
-
       this.$emit("input", this.column, this.listToString(this.fileList));
     },
     // 删除文件

ZR.Vue/src/components/UploadImage/index.vue

@@ -111,9 +111,14 @@ export default {
     },
     //上传成功回调
     handleUploadSuccess(res) {
+      console.log(res);
+      this.loading.close();
+      if (res.code != 200) {
+        this.msgError(`上传失败，原因:${res.msg}!`);
+        return;
+      }
       this.fileList.push({ name: res.data.fileName, url: res.data.url });
       this.$emit(`input`, this.column, this.listToString(this.fileList));
-      this.loading.close();
     },
     // 上传前loading加载
     handleBeforeUpload(file) {
@@ -167,7 +172,7 @@ export default {
       for (let i in list) {
         strs += list[i].url.replace(this.baseUrl, "") + separator;
       }
-      return strs != '' ? strs.substr(0, strs.length - 1) : '';
+      return strs != "" ? strs.substr(0, strs.length - 1) : "";
     },
     handleUploadError() {
       this.$message({

ZR.Vue/src/directive/module/clipboard.js

@@ -0,0 +1,54 @@
+/**
+* v-clipboard 文字复制剪贴
+* Copyright (c) 2021 ruoyi
+*/
+
+import Clipboard from 'clipboard'
+export default {
+  bind(el, binding, vnode) {
+    switch (binding.arg) {
+      case 'success':
+        el._vClipBoard_success = binding.value;
+        break;
+      case 'error':
+        el._vClipBoard_error = binding.value;
+        break;
+      default: {
+        const clipboard = new Clipboard(el, {
+          text: () => binding.value,
+          action: () => binding.arg === 'cut' ? 'cut' : 'copy'
+        });
+        clipboard.on('success', e => {
+          const callback = el._vClipBoard_success;
+          callback && callback(e);
+        });
+        clipboard.on('error', e => {
+          const callback = el._vClipBoard_error;
+          callback && callback(e);
+        });
+        el._vClipBoard = clipboard;
+      }
+    }
+  },
+  update(el, binding) {
+    if (binding.arg === 'success') {
+      el._vClipBoard_success = binding.value;
+    } else if (binding.arg === 'error') {
+      el._vClipBoard_error = binding.value;
+    } else {
+      el._vClipBoard.text = function () { return binding.value; };
+      el._vClipBoard.action = () => binding.arg === 'cut' ? 'cut' : 'copy';
+    }
+  },
+  unbind(el, binding) {
+    if (!el._vClipboard) return
+    if (binding.arg === 'success') {
+      delete el._vClipBoard_success;
+    } else if (binding.arg === 'error') {
+      delete el._vClipBoard_error;
+    } else {
+      el._vClipBoard.destroy();
+      delete el._vClipBoard;
+    }
+  }
+}

ZR.Vue/src/directive/permission/index.js

@@ -1,9 +1,11 @@
 import hasRole from './hasRole'
 import hasPermi from './hasPermi'
+import clipboard from '../module/clipboard'
 
 const install = function(Vue) {
   Vue.directive('hasRole', hasRole)
   Vue.directive('hasPermi', hasPermi)
+	Vue.directive('clipboard', clipboard)
 }
 
 if (window.Vue) {

ZR.Vue/src/main.js

@@ -14,7 +14,7 @@ import permission from './directive/permission'
 
 import './assets/icons' // icon
 import './permission' // permission control
-import { getDicts } from "@/api/system/dict/data";
+import { getDicts} from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, addDateRange2, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
 //分页组件
@@ -44,15 +44,15 @@ Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 
-Vue.prototype.msgSuccess = function(msg) {
+Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success" });
 }
 
-Vue.prototype.msgError = function(msg) {
+Vue.prototype.msgError = function (msg) {
   this.$message({ showClose: true, message: msg, type: "error" });
 }
 
-Vue.prototype.msgInfo = function(msg) {
+Vue.prototype.msgInfo = function (msg) {
   this.$message.info(msg);
 }
 

ZR.Vue/src/utils/datetime.js

@@ -1,216 +0,0 @@
-/* eslint-disable */
-
-/**
- * Date对象的补充函数，包括类似Python中的strftime()
- * 阿债 https://gitee.com/azhai/datetime.js
- */
-
-Date.prototype.toMidnight = function() {
-  this.setHours(0)
-  this.setMinutes(0)
-  this.setSeconds(0)
-  this.setMilliseconds(0)
-  return this
-}
-
-Date.prototype.daysAgo = function(days, midnight) {
-  days = days ? days - 0 : 0
-  const date = new Date(this.getTime() - days * 8.64E7)
-  return midnight ? date.toMidnight() : date
-}
-
-Date.prototype.monthBegin = function(offset) {
-  offset = offset ? offset - 0 : 0
-  const days = this.getDate() - 1 - offset
-  return this.daysAgo(days, true)
-}
-
-Date.prototype.quarterBegin = function() {
-  const month = this.getMonth() - this.getMonth() % 3
-  return new Date(this.getFullYear(), month, 1).toMidnight()
-}
-
-Date.prototype.yearBegin = function() {
-  return new Date(this.getFullYear(), 0, 1).toMidnight()
-}
-
-Date.prototype.strftime = function(format, local) {
-  if (!format) {
-    const str = new Date(this.getTime() + 2.88E7).toISOString()
-    return str.substr(0, 16).replace('T', ' ')
-  }
-  local = local && local.startsWith('zh') ? 'zh' : 'en'
-  const padZero = function(str, len) {
-    const pads = len - str.toString().length
-    return (pads && pads > 0 ? '0'.repeat(pads) : '') + str
-  }
-  format = format.replace('%F', '%Y-%m-%d')
-  format = format.replace(/%D|%x/, '%m/%d/%y')
-  format = format.replace(/%T|%X/, '%H:%M:%S')
-  format = format.replace('%R', '%H:%M')
-  format = format.replace('%r', '%H:%M:%S %p')
-  format = format.replace('%c', '%a %b %e %H:%M:%S %Y')
-  const _this = this
-  return format.replace(/%[A-Za-z%]/g, function(f) {
-    let ans = f
-    switch (f) {
-      case '%%':
-        ans = '%'
-        break
-
-      case '%Y':
-      case '%G':
-        ans = _this.getFullYear()
-        break
-
-      case '%y':
-        ans = _this.getFullYear() % 100
-        break
-
-      case '%C':
-        ans = _this.getFullYear() / 100
-        break
-
-      case '%m':
-      case '%n':
-        ans = _this.getMonth() + 1
-        break
-
-      case '%B':
-        local = local.startsWith('en') ? 'english' : local
-
-      case '%b':
-        const m = _this.getMonth()
-        ans = local_labels.monthes[local][m]
-        break
-
-      case '%d':
-      case '%e':
-        ans = _this.getDate()
-        break
-
-      case '%j':
-        ans = _this.getDaysOfYear()
-        break
-
-      case '%U':
-      case '%W':
-        const ws = _this.getWeeksOfYear(f === '%W')
-        ans = padZero(ws, 2)
-        break
-
-      case '%w':
-        ans = _this.getDay()
-
-      case '%u':
-        ans = ans === 0 ? 7 : ans
-        break
-
-      case '%A':
-        local = local.startsWith('en') ? 'english' : local
-
-      case '%a':
-        const d = _this.getDay()
-        ans = local_labels.weekdays[local][d]
-        break
-
-      case '%H':
-      case '%k':
-        ans = _this.getHours()
-        break
-
-      case '%I':
-      case '%l':
-        ans = _this.getHours()
-        ans = ans % 12
-        break
-
-      case '%M':
-        ans = _this.getMinutes()
-        break
-
-      case '%S':
-        ans = _this.getSeconds()
-        break
-
-      case '%s':
-        ans = parseInt(_this.getTime() / 1E3)
-        break
-
-      case '%f':
-        const ms = _this.getMilliseconds()
-        ans = padZero(ms * 1E3, 6)
-        break
-
-      case '%P':
-        local = local.startsWith('en') ? 'english' : local
-
-      case '%p':
-        const h = _this.getHours()
-        ans = local_labels.meridians[local][h < 12 ? 0 : 1]
-        break
-
-      case '%z':
-        let tzo = _this.getTimezoneOffset()
-        const sign = tzo < 0 ? '-' : '+'
-        tzo = Math.abs(tzo)
-        const ho = padZero(tzo / 60, 2)
-        const mo = padZero(tzo % 60, 2)
-        ans = sign + ho + mo
-        break
-
-      default:
-        break
-    }
-    if (f === '%C' || f === '%y' || f === '%m' || f === '%d' || f === '%H' || f === '%M' || f === '%S') {
-      ans = padZero(ans, 2)
-    }
-    return ans.toString()
-  })
-}
-
-Date.prototype.humanize = function(local) {
-  local = local && local.startsWith('zh') ? 'zh' : 'en'
-  const result = this.strftime('', local)
-  const days = (Date.today() - this.toMidnight().getTime()) / 8.64E7
-  if (days <= -10 || days >= 10) {
-    return result
-  }
-  const labels = local_labels.dayagos[local]
-  let lbl = ''
-  if (days === 0 || days === 1) {
-    lbl = labels[days]
-  } else if (days === -1) {
-    lbl = labels[2]
-  } else if (days >= 2) {
-    lbl = days + labels[3]
-  } else {
-    lbl = days + labels[4]
-  }
-  return lbl + result.substr(10, 6)
-}
-
-const local_labels = {
-  monthes: {
-    english: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
-    en: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-    zh: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
-  },
-  weekdays: {
-    english: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
-    en: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-    zh: ['日', '一', '二', '三', '四', '五', '六']
-  },
-  meridians: {
-    english: ['a.m.', 'p.m.'],
-    en: ['AM', 'PM'],
-    zh: ['上午', '下午']
-  },
-  dayagos: {
-    english: ['Today', 'Yesterday', 'Tomorrow', ' days ago', ' days late'],
-    en: ['Today', 'Yesterday', 'Tomorrow', ' days ago', ' days late'],
-    zh: ['今天', '昨天', '明天', '天前', '天后']
-  }
-}
-
-export default Date

ZR.Vue/src/utils/request.js

@@ -1,13 +1,10 @@
 import axios from 'axios'
-import {
-  MessageBox,
-  Message
-} from 'element-ui'
+import { MessageBox, Message } from 'element-ui'
 import store from '@/store'
-import {
-  getToken
-} from '@/utils/auth'
+import { getToken } from '@/utils/auth'
+// import { blobValidate } from "@/utils/ruoyi";
 // import errorCode from '@/utils/errorCode'
+// import { saveAs } from 'file-saver'
 
 // 解决后端跨域获取不到cookie问题
 axios.defaults.withCredentials = true
@@ -44,7 +41,10 @@ service.interceptors.response.use(res => {
     }
     // 未设置状态码则默认成功状态
     const { code, msg } = res.data;
-
+    // 二进制数据则直接返回
+    if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
+      return res.data
+    }
     if (code == 401) {
       MessageBox.confirm('登录状态已过期，请重新登录', '系统提示', {
         confirmButtonText: '重新登录',
@@ -57,7 +57,7 @@ service.interceptors.response.use(res => {
       })
 
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-    } else if (code == 0 || code == 110 || code == 101 || code == 403 || code == 500) {
+    } else if (code == 0 || code == 1 || code == 110 || code == 101 || code == 403 || code == 500) {
       Message({
         message: msg,
         type: 'error'
@@ -138,4 +138,32 @@ export function postForm(url, data, config) {
     })
   })
 }
+
+
+// 通用下载方法
+// export function download(url, params, filename) {
+//   //downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
+//   return service.post(url, params, {
+//     //transformRequest: [(params) => { return tansParams(params) }],
+//     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+//     responseType: 'blob'
+//   }).then(async (data) => {
+//     const isLogin = await blobValidate(data);
+//     if (isLogin) {
+//       const blob = new Blob([data])
+//       saveAs(blob, filename)
+//     } else {
+//       const resText = await data.text();
+//       const rspObj = JSON.parse(resText);
+//       const errMsg = "出錯了";// errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+//       Message.error(errMsg);
+//     }
+//     // downloadLoadingInstance.close();
+//   }).catch((r) => {
+//     console.error(r)
+//     Message.error('下载文件出现错误，请联系管理员！')
+//     // downloadLoadingInstance.close();
+//   })
+// }
+
 export default service

ZR.Vue/src/utils/ruoyi.js

@@ -69,8 +69,8 @@ export function addDateRange2(dateRange, index) {
   var time = undefined;
   if (null != dateRange && '' != dateRange) {
     if (dateRange.length <= 2) {
-			time = dateRange[index];
-		}
+      time = dateRange[index];
+    }
   }
   return time;
 }
@@ -119,7 +119,9 @@ export function download(fileName) {
 
 // 字符串格式化(%s )
 export function sprintf(str) {
-  var args = arguments, flag = true, i = 1;
+  var args = arguments,
+    flag = true,
+    i = 1;
   str = str.replace(/%s/g, function () {
     var arg = args[i++];
     if (typeof arg === 'undefined') {
@@ -172,3 +174,14 @@ export function handleTree(data, id, parentId, children, rootId) {
   });
   return treeData != '' ? treeData : data;
 }
+
+// 验证是否为blob格式
+export async function blobValidate(data) {
+  try {
+    const text = await data.text();
+    JSON.parse(text);
+    return false;
+  } catch (error) {
+    return true;
+  }
+}

ZR.Vue/src/utils/shortcuts.js

@@ -1,108 +0,0 @@
-import Date from './datetime.js'
-
-export const calendarBaseShortcuts = [{
-  text: '今天',
-  onClick(picker) {
-    const startTime = new Date(new Date().setHours(0, 0, 0))
-    const endTime = new Date(new Date().setHours(23, 59, 59))
-    picker.$emit('pick', [startTime, endTime])
-  }
-}, {
-  text: '昨天',
-  onClick(picker) {
-    const startTime = new Date(new Date().daysAgo(1).setHours(0, 0, 0))
-    const endTime = new Date(new Date().daysAgo(1).setHours(23, 59, 59))
-    picker.$emit('pick', [startTime, endTime])
-  }
-}, {
-  text: '最近一周',
-  onClick(picker) {
-    const startTime = new Date(new Date().daysAgo(7).setHours(0, 0, 0))
-    const endTime = new Date(new Date().setHours(23, 59, 59))
-    picker.$emit('pick', [startTime, endTime])
-  }
-}, {
-  text: '最近30天',
-  onClick(picker) {
-    const startTime = new Date(new Date().daysAgo(30).setHours(0, 0, 0))
-    const endTime = new Date(new Date().setHours(23, 59, 59))
-    picker.$emit('pick', [startTime, endTime])
-  }
-}, {
-  text: '这个月',
-  onClick(picker) {
-    const startTime = new Date(new Date().monthBegin().setHours(0, 0, 0))
-    const endTime = new Date(new Date().setHours(23, 59, 59))
-    picker.$emit('pick', [startTime, endTime])
-  }
-}, {
-  text: '本季度',
-  onClick(picker) {
-    const startTime = new Date(new Date().quarterBegin().setHours(0, 0, 0))
-    const endTime = new Date(new Date().setHours(23, 59, 59))
-    picker.$emit('pick', [startTime, endTime])
-  }
-}]
-
-export const calendarMoveShortcuts = [{
-  text: '‹ 往前一天 ',
-  onClick(picker) {
-    let startTime = new Date(new Date().daysAgo(1).setHours(0, 0, 0))
-    let endTime = new Date(new Date().daysAgo(1).setHours(23, 59, 59))
-    if (!picker.value) {
-      picker.value = [startTime, endTime]
-    }
-    startTime = picker.value[0].daysAgo(1)
-    endTime = picker.value[1].daysAgo(1)
-    picker.$emit('pick', [startTime, picker])
-  }
-}, {
-  text: ' 往后一天 ›',
-  onClick(picker) {
-    let startTime = new Date(new Date().setHours(0, 0, 0))
-    let endTime = new Date(new Date().setHours(23, 59, 59))
-    if (!picker.value) {
-      picker.value = [startTime, endTime]
-    }
-    startTime = picker.value[0].daysAgo(-1)
-    endTime = picker.value[1].daysAgo(-1)
-    picker.$emit('pick', [startTime, endTime])
-  }
-}, {
-  text: '« 往前一周 ',
-  onClick(picker) {
-    let startTime = new Date(new Date().setHours(0, 0, 0))
-    let endTime = new Date(new Date().setHours(23, 59, 59))
-    if (!picker.value) {
-      picker.value = [startTime.daysAgo(new Date().getDay()),
-        endTime.daysAgo(new Date().getDay() + 1)]
-    } else {
-      picker.value = [picker.value[0].daysAgo(picker.value[0].getDay()),
-        picker.value[1].daysAgo(picker.value[1].getDay() + 1)]
-    }
-    startTime = picker.value[0].daysAgo(7)
-    endTime = picker.value[1]
-    picker.$emit('pick', [startTime, endTime])
-  }
-}, {
-  text: ' 往后一周 »',
-  onClick(picker) {
-    let startTime = new Date(new Date().setHours(0, 0, 0))
-    let endTime = new Date(new Date().setHours(23, 59, 59))
-    if (!picker.value) {
-      picker.value = [startTime.daysAgo(new Date().getDay() - 7),
-        endTime.daysAgo(new Date().getDay() - 6)]
-    } else {
-      picker.value = [picker.value[0].daysAgo(picker.value[0].getDay() - 7),
-        picker.value[1].daysAgo(picker.value[1].getDay() - 6)]
-    }
-    startTime = picker.value[0]
-    endTime = picker.value[1].daysAgo(-7)
-    picker.$emit('pick', [startTime, endTime])
-  }
-}]
-
-export const calendarShortcuts = [
-  ...calendarBaseShortcuts,
-  ...calendarMoveShortcuts
-]

ZR.Vue/src/views/login.vue

@@ -151,9 +151,9 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  // background-image: url("../assets/image/login-background.jpg");
+  background-image: url("../assets/image/login-background.jpg");
   background-size: cover;
-  background-color: rgba(56, 157, 170, 0.82);
+  // background-color: rgba(56, 157, 170, 0.82);
 }
 .title {
   margin: 0px auto 30px auto;

ZR.Vue/src/views/monitor/operlog/index.vue

@@ -5,7 +5,8 @@
         <el-input v-model="queryParams.title" placeholder="请输入系统模块" clearable style="width: 200px;" size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="操作人员" prop="operName">
-        <el-input v-model="queryParams.operName" placeholder="请输入操作人员" clearable style="width: 160px;" size="small" @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.operName" placeholder="请输入操作人员" clearable style="width: 160px;" size="small"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="类型" prop="businessType">
         <el-select v-model="queryParams.businessType" placeholder="操作类型" clearable size="small" style="width: 240px">
@@ -18,8 +19,8 @@
         </el-select>
       </el-form-item>
       <el-form-item label="操作时间">
-        <!-- <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker> -->
-        <date-range-picker v-model="dateRange" class="date-item" />
+        <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -29,13 +30,15 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['monitor:operlog:remove']">删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['monitor:operlog:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" @click="handleClean" v-hasPermi="['monitor:operlog:remove']">清空</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:operlog:export']">导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:operlog:export']">导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -52,7 +55,8 @@
       <el-table-column label="操作状态" align="center" prop="status" :formatter="statusFormat" />
       <el-table-column label="用时" align="center" prop="elapsed">
         <template slot-scope="scope">
-          <span :style="scope.row.elapsed < 1000 ? 'color:green':scope.row.elapsed <3000 ?'color:orange':'color:red'">{{ scope.row.elapsed }} ms</span>
+          <span :style="scope.row.elapsed < 1000 ? 'color:green':scope.row.elapsed <3000 ?'color:orange':'color:red'">{{ scope.row.elapsed }}
+            ms</span>
         </template>
       </el-table-column>
       <el-table-column label="日志内容" align="center" prop="errorMsg" :show-overflow-tooltip="true" />
@@ -63,7 +67,8 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row,scope.index)" v-hasPermi="['monitor:operlog:query']">详细</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row,scope.index)" v-hasPermi="['monitor:operlog:query']">详细
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -124,11 +129,8 @@ import {
   cleanOperlog,
   exportOperlog,
 } from "@/api/monitor/operlog";
-import DateRangePicker from "@/components/DateRangePicker";
-import { downloadFile } from "@/utils/zipdownload.js";
 
 export default {
-  components: { DateRangePicker },
   name: "Operlog",
   data() {
     return {
@@ -267,10 +269,7 @@ export default {
           const { code, data } = response;
           if (code == 200) {
             this.msgSuccess("导出成功");
-            downloadFile(
-              process.env.VUE_APP_BASE_API + data.path,
-              data.fileName
-            );
+            this.download(data.path);
           } else {
             this.msgError("导出失败");
           }

ZR.Vue/src/views/system/post/index.vue

@@ -29,7 +29,7 @@
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:post:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:post:export']">导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:post:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -98,7 +98,6 @@ import {
   updatePost,
   exportPost,
 } from "@/api/system/post";
-import { downloadFile } from "@/utils/zipdownload.js";
 
 export default {
   name: "Post",
@@ -269,12 +268,7 @@ export default {
           return exportPost(queryParams);
         })
         .then((response) => {
-          console.log(response)
-          // this.download(response.msg);
-          downloadFile(
-              process.env.VUE_APP_BASE_API + response.data.path,
-              response.data.fileName
-            );
+					this.download(response.data.path);
         });
     },
   },

ZR.Vue/src/views/system/user/index.vue

@@ -7,17 +7,20 @@
           <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" />
         </div>
         <div class="head-container">
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" default-expand-all @node-click="handleNodeClick" />
+          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree"
+            default-expand-all @node-click="handleNodeClick" />
         </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="20">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="用户名称" prop="userName">
-            <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable size="small" style="width: 240px" @keyup.enter.native="handleQuery" />
+            <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable size="small" style="width: 240px"
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="手机号码" prop="phonenumber">
-            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable size="small" style="width: 240px" @keyup.enter.native="handleQuery" />
+            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable size="small" style="width: 240px"
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="状态" prop="status">
             <el-select v-model="queryParams.status" placeholder="用户状态" clearable size="small" style="width: 240px">
@@ -25,7 +28,8 @@
             </el-select>
           </el-form-item>
           <el-form-item label="创建时间">
-            <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+            <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
+              start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -38,16 +42,19 @@
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button>
+            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+              v-hasPermi="['system:user:edit']">修改</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
+            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+              v-hasPermi="['system:user:remove']">删除</el-button>
           </el-col>
-          <!-- <el-col :span="1.5">
+          <el-col :span="1.5">
             <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
-          </el-col> -->
+          </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
+            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出
+            </el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
@@ -78,8 +85,10 @@
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">修改</el-button>
-              <el-button v-if="scope.row.userId !== 1 | scope.row.userName != 'admin'" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
-              <el-button size="mini" type="text" icon="el-icon-key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']">重置</el-button>
+              <el-button v-if="scope.row.userId !== 1 | scope.row.userName != 'admin'" size="mini" type="text" icon="el-icon-delete"
+                @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
+              <el-button size="mini" type="text" icon="el-icon-key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']">重置
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -148,14 +157,16 @@
           <el-col :span="12">
             <el-form-item label="岗位">
               <el-select v-model="form.postIds" multiple placeholder="请选择">
-                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId" :disabled="item.status == 1"></el-option>
+                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId" :disabled="item.status == 1">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="角色">
               <el-select v-model="form.roleIds" multiple placeholder="请选择" @change="selectRole($event)">
-                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></el-option>
+                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -176,19 +187,17 @@
 
     <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload name="file" ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+      <el-upload name="file" ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess" :auto-upload="false" drag>
         <i class="el-icon-upload"></i>
-        <div class="el-upload__text">
-          将文件拖到此处，或
-          <em>点击上传</em>
-        </div>
-        <div class="el-upload__tip" slot="tip">
-          <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-          <el-link type="info" style="font-size: 12px" @click="importTemplate">下载模板</el-link>
-        </div>
-        <div class="el-upload__tip" style="color: red" slot="tip">
-          提示：仅允许导入“xls”或“xlsx”格式文件！
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -209,13 +218,11 @@ import {
   exportUser,
   resetUserPwd,
   changeUserStatus,
-  // importTemplate,
 } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import { treeselect } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { downloadFile } from "@/utils/zipdownload.js";
 
 export default {
   name: "User",
@@ -273,7 +280,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: 'Bearer ' + getToken() },
+        headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "system/user/importData",
       },
@@ -548,14 +555,10 @@ export default {
         type: "warning",
       }).then(() => {
         exportUser(queryParams).then((response) => {
-          console.log(JSON.stringify(response));
           const { code, data } = response;
           if (code == 200) {
             this.msgSuccess("导出成功");
-            downloadFile(
-              process.env.VUE_APP_BASE_API + data.path,
-              data.fileName
-            );
+            this.download(data.path);
           } else {
             this.msgError("导出失败");
           }
@@ -569,9 +572,7 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      // importTemplate().then((response) => {
-      downLoadExcel("system/user/importTemplate", "用户数据导入模板");
-      // });
+      this.download("/system/user/importTemplate", "用户数据导入模板");
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {

ZR.Vue/src/views/tool/gen/editTable.vue

@@ -157,7 +157,7 @@ export default {
         getGenTable(tableId).then((res) => {
           this.columns = res.data.columns;
           this.info = res.data.info;
-          this.tables = res.data.tables; //子表
+          this.tables = res.data.tables;//子表
         });
         /** 查询字典下拉列表 */
         listType({ pageSize: 100 }).then((response) => {

ZR.Vue/src/views/tool/gen/genInfoForm.vue

@@ -7,7 +7,8 @@
           <el-select v-model="info.tplCategory" @change="tplSelectChange">
             <el-option label="单表（增删改查）" value="crud" />
             <!-- <el-option label="树表（增删改查）" value="tree" />
-            <el-option label="主子表（增删改查）" value="sub" /> -->
+						<el-option label="导航查询" value="subNav"></el-option> -->
+            <!-- <el-option label="主子表（增删改查）" value="sub" /> -->
           </el-select>
         </el-form-item>
       </el-col>
@@ -179,7 +180,7 @@
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>
-          <el-select v-model="info.subTableName" placeholder="请选择" @change="subSelectChange">
+          <el-select v-model="info.subTableName" placeholder="请选择" @change="subSelectChange(this)">
             <el-option v-for="(table, index) in tables" :key="index" :label="table.tableName + '：' + table.tableComment" :value="table.tableName">
             </el-option>
           </el-select>
@@ -203,6 +204,7 @@
   </el-form>
 </template>
 <script>
+import { queryColumnInfo } from "@/api/tool/gen";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -214,7 +216,7 @@ export default {
       type: Object,
       default: null,
     },
-    // 字表
+    // 子表
     tables: {
       type: Array,
       default: null,
@@ -237,10 +239,20 @@ export default {
           { required: true, message: "请选择生成模板", trigger: "blur" },
         ],
         moduleName: [
-          { required: true, message: "请输入生成模块名", trigger: "blur", pattern:/^[A-Za-z]+$/ },
+          {
+            required: true,
+            message: "请输入生成模块名",
+            trigger: "blur",
+            pattern: /^[A-Za-z]+$/,
+          },
         ],
         businessName: [
-          { required: true, message: "请输入生成业务名", trigger: "blur", pattern:/^[A-Za-z]+$/},
+          {
+            required: true,
+            message: "请输入生成业务名",
+            trigger: "blur",
+            pattern: /^[A-Za-z]+$/,
+          },
         ],
         functionName: [
           { required: true, message: "请输入生成功能名", trigger: "blur" },
@@ -281,10 +293,18 @@ export default {
     },
     /** 设置关联外键 */
     setSubTableColumns(value) {
+      console.log(value);
+      if (value == null || value == undefined || value == "") {
+        return;
+      }
       for (var item in this.tables) {
-        const name = this.tables[item].tableName;
-        if (value === name) {
-          this.subColumns = this.tables[item].columns;
+        const obj = this.tables[item];
+        if (value === obj.tableName) {
+          queryColumnInfo(obj.tableId).then((res) => {
+            if (res.code == 200) {
+              this.subColumns = res.data.columns;
+            }
+          });
           break;
         }
       }

ZR.Vue/src/views/tool/gen/index.vue

@@ -7,7 +7,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleSearch()">查询</el-button>
-        <el-button type="default" icon="el-icon-refresh" size="small" @click="loadTableData()">刷新</el-button>
+        <!-- <el-button type="default" icon="el-icon-refresh" size="small" @click="loadTableData()">刷新</el-button> -->
       </el-form-item>
     </el-form>
 
@@ -28,9 +28,11 @@
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="tableName" label="表名" sortable="custom" width="180" />
+      <el-table-column prop="dbName" label="数据库名" width="100" />
+      <el-table-column prop="tableId" label="表id" width="80" />
+      <el-table-column prop="tableName" label="表名" sortable="custom" width="110" :show-overflow-tooltip="true" />
       <el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true" />
-      <el-table-column prop="className" label="实体" />
+      <el-table-column prop="className" label="实体" :show-overflow-tooltip="true" />
       <el-table-column prop="createTime" label="创建时间" />
       <el-table-column prop="updateTime" label="更新时间" />
       <el-table-column label="操作" align="center" width="350">
@@ -38,7 +40,7 @@
           <el-button type="text" icon="el-icon-view" @click="handleShowDialog(scope.row, 'preview')" v-hasPermi="['tool:gen:preview']">预览</el-button>
           <el-button type="text" icon="el-icon-edit" @click="handleEditTable(scope.row)" v-hasPermi="['tool:gen:edit']">编辑</el-button>
           <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['tool:gen:remove']">删除</el-button>
-          <!-- <el-button type="text" icon="el-icon-refresh" @click="handleRefresh(scope.row)" v-hasPermi="['tool:gen:refresh']">同步</el-button> -->
+          <el-button type="text" icon="el-icon-refresh" @click="handleSynchDb(scope.row)" v-hasPermi="['tool:gen:edit']">同步</el-button>
           <el-button type="text" icon="el-icon-download" @click="handleShowDialog(scope.row, 'generate')" v-hasPermi="['tool:gen:code']">生成代码
           </el-button>
         </template>
@@ -50,8 +52,9 @@
     <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body>
       <el-tabs v-model="preview.activeName">
         <el-tab-pane v-for="(item, key) in preview.data" :label="item.title" :name="key.toString()" :key="key">
-          <pre v-html="highlightedCode(item.content)">
-          </pre>
+          <el-link :underline="false" icon="el-icon-document-copy" v-clipboard:copy="item.content" v-clipboard:success="clipboardSuccess"
+            style="float:right">复制</el-link>
+          <pre><code class="hljs" v-html="highlightedCode(item.content, item.title)"></code></pre>
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
@@ -91,11 +94,11 @@
 <script>
 import {
   codeGenerator,
-  getGenTable,
+  listTable,
   delTable,
   previewTable,
+	synchDb
 } from "@/api/tool/gen";
-import { downloadFile } from "@/utils/zipdownload.js";
 import importTable from "./importTable";
 import { Loading } from "element-ui";
 import hljs from "highlight.js";
@@ -151,7 +154,7 @@ export default {
     handleSearch() {
       this.tableloading = true;
 
-      getGenTable(this.queryParams).then((res) => {
+      listTable(this.queryParams).then((res) => {
         this.tableData = res.data.result;
         this.total = res.data.totalNum;
         this.tableloading = false;
@@ -230,10 +233,7 @@ export default {
               if (code == 200) {
                 this.showGenerate = false;
                 this.msgSuccess("恭喜你，代码生成完成！");
-                downloadFile(
-                  process.env.VUE_APP_BASE_API + data.zipPath,
-                  data.fileName
-                );
+                this.download(data.path);
               } else {
                 this.msgError(res.msg);
               }
@@ -278,6 +278,11 @@ export default {
           });
         });
     },
+    /** 复制代码成功 */
+    clipboardSuccess() {
+      this.msgSuccess("复制成功");
+    },
+    // 多选框选中数据
     handleSelectionChange(section) {
       this.tableIds = section.map((item) => item.tableId);
       this.multiple = !section.length;
@@ -285,15 +290,21 @@ export default {
     },
     /** 高亮显示 */
     highlightedCode(code, key) {
-      // var language = vmName.substring(vmName.indexOf(".") + 1, vmName.length);
+      // var language = key.substring(key.lastIndexOf(".") , key.length)
       const result = hljs.highlightAuto(code || "");
       return result.value || "&nbsp;";
     },
-    handleRefresh(row) {
-      this.$message({
-        type: "info",
-        message: "敬请期待",
-      });
+    // 同步代码
+    handleSynchDb(row) {
+      const tableName = row.tableName;
+      this.$confirm('确认要强制同步"' + tableName + '"表结构吗？')
+        .then(function () {
+          return synchDb(row.tableId, { tableName, dbName: row.dbName });
+        })
+        .then(() => {
+          this.msgSuccess("同步成功");
+        })
+        .catch(() => {});
     },
   },
 };