update

update 背景图片
update axios version
2024-08-17 21:17:40 +08:00 · 2024-01-09 14:30:40 +08:00 · 2024-01-02 14:02:18 +08:00 · 2023-07-26 14:06:46 +08:00 · 2023-07-11 10:22:04 +08:00 · 2023-07-11 10:21:49 +08:00
25 changed files with 162 additions and 277 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
 ENV = 'development'

 # 接口地址
-VUE_APP_BASE_API  = 'http://localhost:8000'
+VUE_APP_BASE_API  = 'https://eladmin.vip'
 VUE_APP_WS_API = 'ws://localhost:8000'

 # 是否启用 babel-plugin-dynamic-import-node插件
--- a/.env.production
+++ b/.env.production
@@ -2,6 +2,6 @@ ENV = 'production'

 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
-VUE_APP_BASE_API  = 'https://eladmin.vip'
+VUE_APP_BASE_API  = '/'
 # 如果接口是 http 形式， wss 需要改为 ws
-VUE_APP_WS_API = 'wss://eladmin.vip'
+VUE_APP_WS_API = '/'
--- a/README.md
+++ b/README.md
@@ -1,70 +1,7 @@
-# ELADMIN-WEB
+# 注意

-ELADMIN 前端源码
+该分支仅用于 预览服务器 Jenkins 自动部署

-#### 项目源码
+# 请勿使用该分支进行开发

-|     |   后端源码  |   前端源码  |
-|---  |--- | --- |
-|  github   |  https://github.com/elunez/eladmin   |  https://github.com/elunez/eladmin-web   |
-|  码云   |  https://gitee.com/elunez/eladmin   |  https://gitee.com/elunez/eladmin-web   |
-
-#### 开发文档
-[https://eladmin.vip](https://eladmin.vip)
-
-#### 体验地址
-[https://eladmin.vip/demo](https://eladmin.vip/demo)
-
-#### 前端模板
-
-初始模板基于： [https://github.com/PanJiaChen/vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
-
-模板文档： [https://panjiachen.github.io/vue-element-admin-site/zh/guide/](https://panjiachen.github.io/vue-element-admin-site/zh/guide/)
-
-#### Build Setup
-**推荐 node 版本：12-16**
-``` bash
-# 配置镜像加速
-https://www.ydyno.com/archives/1219.html
-
-# 安装依赖
-npm install
-
-# 启动服务 localhost:8013
-npm run dev
-
-# 构建生产环境
-npm run build:prod
-```
-
-#### 常见问题
-
-1、linux 系统在安装依赖的时候会出现 node-sass 无法安装的问题
-
-解决方案：
-```
-1. 单独安装：npm install --unsafe-perm node-sass 
-2. 直接使用：npm install --unsafe-perm
-```
-
-2、加速node-sass安装
-
-https://www.ydyno.com/archives/1219.html
-
-#### 特别鸣谢
-
- 感谢 [JetBrains](https://www.jetbrains.com/) 提供的非商业开源软件开发授权
-
- 感谢 [PanJiaChen](https://github.com/PanJiaChen/vue-element-admin) 大佬提供的前端模板
-
- 感谢 [Moxun](https://github.com/moxun1639) 大佬提供的前端 Crud 通用组件
-
- 感谢 [zhy6599](https://gitee.com/zhy6599) 大佬提供的后端运维管理相关功能
-
- 感谢 [j.yao.SUSE](https://github.com/everhopingandwaiting) 大佬提供的匿名接口与Redis限流等功能
-
- 感谢 [d15801543974](https://github.com/d15801543974) 大佬提供的基于注解的通用查询方式
-
-#### 反馈交流
-
- QQ交流群：891137268 、947578238、659622532
+# 开发请选择 master 分支
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
  "license": "Apache-2.0",
  "scripts": {
    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
+    "build:prod": "vue-cli-service build --max_old_space_size=8096",
    "build:stage": "vue-cli-service build --mode staging",
    "preview": "node build/index.js --preview",
    "lint": "eslint --ext .js,.vue src",
@@ -36,7 +36,7 @@
    "@riophae/vue-treeselect": "^0.4.0",
    "@wangeditor/editor": "^5.1.23",
    "@wangeditor/editor-for-vue": "^1.0.2",
-    "axios": "^0.21.1",
+    "axios": "^1.6.0",
    "clipboard": "2.0.4",
    "codemirror": "^5.49.2",
    "core-js": "^2.6.12",
@@ -66,8 +66,7 @@
    "vuedraggable": "2.20.0",
    "vuex": "3.1.0",
    "wangeditor": "^4.7.11",
-    "webpack": "^4.46.0",
-    "xlsx": "^0.18.5"
+    "webpack": "^4.46.0"
  },
  "devDependencies": {
    "@babel/parser": "^7.7.4",
--- a/public/index.html
+++ b/public/index.html
@@ -1,11 +1,12 @@
 <!DOCTYPE html>
 <html>
  <head>
+    <meta base="/demo/">
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="renderer" content="webkit">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link href="<%= BASE_URL %>favicon.ico" rel="icon">
    <title><%= webpackConfig.name %></title>
  </head>
  <body>
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,2 +1,3 @@
 User-agent: *
-Disallow: /
+
+Allow: /
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -8,10 +8,11 @@ export function getDepts(params) {
  })
 }

-export function getDeptSuperior(ids) {
+export function getDeptSuperior(ids, exclude) {
+  exclude = exclude !== undefined ? exclude : false
  const data = ids.length || ids.length === 0 ? ids : Array.of(ids)
  return request({
-    url: 'api/dept/superior',
+    url: 'api/dept/superior?exclude=' + exclude,
    method: 'post',
    data
  })
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -45,6 +45,14 @@ export function updatePass(user) {
  })
 }

+export function resetPwd(ids) {
+  return request({
+    url: 'api/users/resetPwd',
+    method: 'put',
+    data: ids
+  })
+}
+
 export function updateEmail(form) {
  const data = {
    password: encrypt(form.pass),
@@ -57,5 +65,5 @@ export function updateEmail(form) {
  })
 }

-export default { add, edit, del }
+export default { add, edit, del, resetPwd }

--- a/src/assets/icons/svg/vps.svg
+++ b/src/assets/icons/svg/vps.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1690351561879" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10676" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M832 320H362.666667c-46.933333 0-85.333333 38.4-85.333334 85.333333v298.666667c0 46.933333 38.4 85.333333 85.333334 85.333333h149.333333l-21.333333 64h-74.666667c-17.066667 0-32 14.933333-32 32s14.933333 32 32 32h362.666667c17.066667 0 32-14.933333 32-32s-14.933333-32-32-32H704l-21.333333-64h149.333333c46.933333 0 85.333333-38.4 85.333333-85.333333V405.333333c0-46.933333-38.4-85.333333-85.333333-85.333333z" p-id="10677" fill="#bfbfbf"></path><path d="M320 885.333333c0-12.8 2.133333-25.6 6.4-36.266666-64-14.933333-113.066667-74.666667-113.066667-145.066667V405.333333c0-83.2 66.133333-149.333333 149.333334-149.333333h170.666666V192c0-46.933333-38.4-85.333333-85.333333-85.333333H192C145.066667 106.666667 106.666667 145.066667 106.666667 192v640c0 46.933333 38.4 85.333333 85.333333 85.333333h134.4c-4.266667-10.666667-6.4-21.333333-6.4-32z" p-id="10678" fill="#bfbfbf"></path></svg>
--- a/src/assets/images/background.jpeg
+++ b/src/assets/images/background.jpeg
--- a/src/assets/images/background.webp
+++ b/src/assets/images/background.webp
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -207,3 +207,81 @@
    }
  }
 }
+
+.sidebar-container-ad {
+  transition: width 0.28s;
+  width: $sideBarWidth !important;
+  background-color: $menuBg;
+  height: 30%;
+  position: fixed;
+  font-size: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+
+  // reset element-ui css
+  .horizontal-collapse-transition {
+    transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
+  }
+
+  .scrollbar-wrapper {
+    overflow-x: hidden !important;
+  }
+
+  .el-scrollbar__bar.is-vertical {
+    right: 0;
+  }
+
+  .el-scrollbar {
+    height: 100%;
+  }
+
+  &.has-logo {
+    .el-scrollbar {
+      height: calc(100% - 50px);
+    }
+  }
+
+  .is-horizontal {
+    display: none;
+  }
+
+  a {
+    display: inline-block;
+    width: 100%;
+    overflow: hidden;
+  }
+
+  .svg-icon {
+    margin-right: 16px;
+  }
+
+  .el-menu {
+    border: none;
+    height: 100%;
+    width: 100% !important;
+  }
+
+  // menu hover
+  .submenu-title-noDropdown,
+  .el-submenu__title {
+    &:hover {
+      background-color: $menuHover !important;
+    }
+  }
+
+  .is-active>.el-submenu__title {
+    color: $subMenuActiveText !important;
+  }
+
+  & .nest-menu .el-submenu>.el-submenu__title,
+  & .el-submenu .el-menu-item {
+    min-width: $sideBarWidth !important;
+    background-color: $subMenuBg !important;
+
+    &:hover {
+      background-color: $subMenuHover !important;
+    }
+  }
+}
--- a/src/components/Crud/crud.js
+++ b/src/components/Crud/crud.js
@@ -34,7 +34,7 @@ function CRUD(options) {
    // 排序规则，默认 id 降序， 支持多字段排序 ['id,desc', 'createTime,asc']
    sort: ['id,desc'],
    // 等待时间
-    time: 50,
+    time: 1,
    // CRUD Method
    crudMethod: {
      add: (form) => {},
--- a/src/components/UploadExcel/index.vue
+++ b/src/components/UploadExcel/index.vue
@@ -1,138 +0,0 @@
-<template>
-  <div>
-    <input ref="excel-upload-input" class="excel-upload-input" type="file" accept=".xlsx, .xls" @change="handleClick">
-    <div class="drop" @drop="handleDrop" @dragover="handleDragover" @dragenter="handleDragover">
-      拖拽excel文件到此处 或者
-      <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="handleUpload">
-        浏览
-      </el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import XLSX from 'xlsx'
-
-export default {
-  props: {
-    beforeUpload: Function, // eslint-disable-line
-    onSuccess: Function// eslint-disable-line
-  },
-  data() {
-    return {
-      loading: false,
-      excelData: {
-        header: null,
-        results: null
-      }
-    }
-  },
-  methods: {
-    generateData({ header, results }) {
-      this.excelData.header = header
-      this.excelData.results = results
-      this.onSuccess && this.onSuccess(this.excelData)
-    },
-    handleDrop(e) {
-      e.stopPropagation()
-      e.preventDefault()
-      if (this.loading) return
-      const files = e.dataTransfer.files
-      if (files.length !== 1) {
-        this.$message.error('只支持单个文件上传!')
-        return
-      }
-      const rawFile = files[0]
-
-      if (!this.isExcel(rawFile)) {
-        this.$message.error('只支持.xlsx, .xls, .csv 格式文件')
-        return false
-      }
-      this.upload(rawFile)
-      e.stopPropagation()
-      e.preventDefault()
-    },
-    handleDragover(e) {
-      e.stopPropagation()
-      e.preventDefault()
-      e.dataTransfer.dropEffect = 'copy'
-    },
-    handleUpload() {
-      this.$refs['excel-upload-input'].click()
-    },
-    handleClick(e) {
-      const files = e.target.files
-      const rawFile = files[0] // only use files[0]
-      if (!rawFile) return
-      this.upload(rawFile)
-    },
-    upload(rawFile) {
-      this.$refs['excel-upload-input'].value = null // fix can't select the same excel
-
-      if (!this.beforeUpload) {
-        this.readerData(rawFile)
-        return
-      }
-      const before = this.beforeUpload(rawFile)
-      if (before) {
-        this.readerData(rawFile)
-      }
-    },
-    readerData(rawFile) {
-      this.loading = true
-      return new Promise((resolve, reject) => {
-        const reader = new FileReader()
-        reader.onload = e => {
-          const data = e.target.result
-          const workbook = XLSX.read(data, { type: 'array' })
-          const firstSheetName = workbook.SheetNames[0]
-          const worksheet = workbook.Sheets[firstSheetName]
-          const header = this.getHeaderRow(worksheet)
-          const results = XLSX.utils.sheet_to_json(worksheet)
-          this.generateData({ header, results })
-          this.loading = false
-          resolve()
-        }
-        reader.readAsArrayBuffer(rawFile)
-      })
-    },
-    getHeaderRow(sheet) {
-      const headers = []
-      const range = XLSX.utils.decode_range(sheet['!ref'])
-      let C
-      const R = range.s.r
-      /* start in the first row */
-      for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
-        const cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })]
-        /* find the cell in the first row */
-        let hdr = 'UNKNOWN ' + C // <-- replace with your desired default
-        if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
-        headers.push(hdr)
-      }
-      return headers
-    },
-    isExcel(file) {
-      return /\.(xlsx|xls|csv)$/.test(file.name)
-    }
-  }
-}
-</script>
-
-<style scoped>
-.excel-upload-input{
-  display: none;
-  z-index: -9999;
-}
-.drop{
-  border: 2px dashed #bbb;
-  width: 600px;
-  height: 160px;
-  line-height: 160px;
-  margin: 0 auto;
-  font-size: 24px;
-  border-radius: 5px;
-  text-align: center;
-  color: #bbb;
-  position: relative;
-}
-</style>
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -5,7 +5,6 @@
        <router-view :key="key" />
      </keep-alive>
    </transition>
-    <el-backtop :bottom="50" :right="40"><i class="el-icon-caret-top" /></el-backtop>
    <div v-if="$store.state.settings.showFooter" id="el-main-footer">
      <span v-html="$store.state.settings.footerTxt" />
      <span v-if="$store.state.settings.caseNumber"> ⋅ </span>
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -13,7 +13,7 @@ const whiteList = ['/login']// no redirect whitelist

 router.beforeEach((to, from, next) => {
  if (to.meta.title) {
-    document.title = to.meta.title + ' - ' + Config.title
+    document.title = Config.title + ' - ' + to.meta.title
  }
  NProgress.start()
  if (getToken()) {
--- a/src/router/routers.js
+++ b/src/router/routers.js
@@ -61,8 +61,9 @@ export const constantRouterMap = [
 ]

 export default new Router({
-  // mode: 'hash',
-  mode: 'history',
+  mode: 'hash',
+  base: '/demo/',
+  // mode: 'history',
  scrollBehavior: () => ({ y: 0 }),
  routes: constantRouterMap
 })
--- a/src/views/components/excel/upload-excel.vue
+++ b/src/views/components/excel/upload-excel.vue
@@ -1,41 +0,0 @@
-<template>
-  <div class="app-container">
-    <upload-excel-component :on-success="handleSuccess" :before-upload="beforeUpload" />
-    <el-table :data="tableData" border highlight-current-row style="width: 100%;margin-top:20px;">
-      <el-table-column v-for="item of tableHeader" :key="item" :prop="item" :label="item" />
-    </el-table>
-  </div>
-</template>
-
-<script>
-import UploadExcelComponent from '@/components/UploadExcel/index.vue'
-
-export default {
-  name: 'UploadExcel',
-  components: { UploadExcelComponent },
-  data() {
-    return {
-      tableData: [],
-      tableHeader: []
-    }
-  },
-  methods: {
-    beforeUpload(file) {
-      const isLt1M = file.size / 1024 / 1024 < 1
-      if (isLt1M) {
-        return true
-      }
-
-      this.$message({
-        message: '请不要上传大于1m的文件.',
-        type: 'warning'
-      })
-      return false
-    },
-    handleSuccess({ results, header }) {
-      this.tableData = results
-      this.tableHeader = header
-    }
-  }
-}
-</script>
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -47,7 +47,7 @@ import Config from '@/settings'
 import { getCodeImg } from '@/api/login'
 import Cookies from 'js-cookie'
 import qs from 'qs'
-import Background from '@/assets/images/background.webp'
+import Background from '@/assets/images/background.jpeg'
 export default {
  name: 'Login',
  data() {
--- a/src/views/mnt/deploy/deploy.vue
+++ b/src/views/mnt/deploy/deploy.vue
@@ -147,7 +147,7 @@ export default {
      })
    },
    initWebSocket() {
-      const wsUri = (process.env.VUE_APP_WS_API === '/' ? '/' : (process.env.VUE_APP_WS_API + '/')) + 'webSocket/deploy'
+      const wsUri = process.env.VUE_APP_WS_API + '/webSocket/deploy'
      this.websock = new WebSocket(wsUri)
      this.websock.onerror = this.webSocketOnError
      this.websock.onmessage = this.webSocketOnMessage
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -161,10 +161,10 @@ export default {
      }
    },
    getSupDepts(id) {
-      crudDept.getDeptSuperior(id).then(res => {
-        const date = res.content
-        this.buildDepts(date)
-        this.depts = date
+      crudDept.getDeptSuperior(id, true).then(res => {
+        const data = res.content
+        this.buildDepts(data)
+        this.depts = data
      })
    },
    buildDepts(depts) {
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -57,7 +57,19 @@
            </el-select>
            <rrOperation />
          </div>
-          <crudOperation show="" :permission="permission" />
+          <crudOperation show="" :permission="permission">
+            <el-button
+              slot="right"
+              v-permission="['admin','user:add']"
+              :disabled="crud.selections.length === 0"
+              class="filter-item"
+              size="mini"
+              type="primary"
+              icon="el-icon-refresh-left"
+              @click="resetPwd(crud.selections)"
+            >重置密码
+            </el-button>
+          </crudOperation>
        </div>
        <!--表单渲染-->
        <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="570px">
@@ -471,6 +483,23 @@ export default {
    },
    checkboxT(row, rowIndex) {
      return row.id !== this.user.id
+    },
+    resetPwd(datas) {
+      this.$confirm(`你选中了 ${datas.length} 位用户，确认重置用户的密码吗?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const ids = []
+        datas.forEach(val => {
+          ids.push(val.id)
+        })
+        console.log(ids)
+        crudUser.resetPwd(ids).then(() => {
+          this.crud.notify('重置成功, 用户新密码:123456', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        }).catch(() => {})
+      }).catch(() => {
+      })
    }
  }
 }
--- a/src/views/tools/storage/local/index.vue
+++ b/src/views/tools/storage/local/index.vue
@@ -41,7 +41,7 @@
            :action="fileUploadApi + '?name=' + form.name"
          >
            <div class="eladmin-upload"><i class="el-icon-upload" /> 添加文件</div>
-            <div slot="tip" class="el-upload__tip">可上传任意格式文件，且不超过100M</div>
+            <div slot="tip" class="el-upload__tip">请勿上传违法文件，演示环境带宽有限，限制文件大小小于50KB</div>
          </el-upload>
        </el-form-item>
      </el-form>
@@ -145,10 +145,10 @@ export default {
    },
    beforeUpload(file) {
      let isLt2M = true
-      isLt2M = file.size / 1024 / 1024 < 100
+      isLt2M = file.size / 1024 < 52
      if (!isLt2M) {
        this.loading = false
-        this.$message.error('上传文件大小不能超过 100MB!')
+        this.$message.error('上传文件大小超出限制:50KB')
      }
      this.form.name = file.name
      return isLt2M
--- a/src/views/tools/storage/qiniu/index.vue
+++ b/src/views/tools/storage/qiniu/index.vue
@@ -32,6 +32,7 @@
          :before-remove="handleBeforeRemove"
          :on-success="handleSuccess"
          :on-error="handleError"
+          :before-upload="beforeUpload"
          :file-list="fileList"
          :headers="headers"
          :action="qiNiuUploadApi"
@@ -39,7 +40,7 @@
          multiple
        >
          <el-button size="small" type="primary">点击上传</el-button>
-          <div slot="tip" style="display: block;" class="el-upload__tip">请勿上传违法文件，且文件不超过15M</div>
+          <div slot="tip" style="display: block;" class="el-upload__tip">请勿上传违法文件，演示环境带宽有限，限制文件大小小于50KB</div>
        </el-upload>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="doSubmit">确认</el-button>
@@ -120,6 +121,15 @@ export default {
      _this.init()
      _this.dialog = true
    },
+    beforeUpload(file) {
+      let isLt2M = true
+      isLt2M = file.size / 1024 < 52
+      if (!isLt2M) {
+        this.loading = false
+        this.$message.error('上传文件大小超出限制:50KB')
+      }
+      return isLt2M
+    },
    handleSuccess(response, file, fileList) {
      const uid = file.uid
      const id = response.id
--- a/vue.config.js
+++ b/vue.config.js
@@ -13,9 +13,8 @@ const port = 8013 // 端口配置
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
  // hash 模式下可使用
-  // publicPath: process.env.NODE_ENV === 'development' ? '/' : './',
-  publicPath: '/',
-  outputDir: 'dist',
+  publicPath: process.env.NODE_ENV === 'development' ? '/' : '/demo/',
+  outputDir: 'demo',
  assetsDir: 'static',
  lintOnSave: process.env.NODE_ENV === 'development',
  productionSourceMap: false,
Author	SHA1	Message	Date
Zheng Jie	1c84fca443	update	2024-08-17 21:17:40 +08:00
Zheng Jie	e89b752667	update 背景图片	2024-01-09 14:30:40 +08:00
Zheng Jie	3739071bd6	update axios version	2024-01-02 14:02:18 +08:00
Zheng Jie	2c876a2a11	update	2023-07-26 14:06:46 +08:00
Zheng Jie	d2f0af59b1	Merge branch 'master' into deploy # Conflicts: # README.md	2023-07-11 10:22:04 +08:00
Zheng Jie	543afadea4	移除无用组件	2023-07-11 10:21:49 +08:00
Zheng Jie	95290a4ecb	update README.md	2023-07-07 18:09:25 +08:00
Zheng Jie	8089e8b193	Merge branch 'master' into deploy	2023-07-07 17:50:12 +08:00
Zheng Jie	9e874e9b5f	代码优化，避免【部门】移动节点时出现PID数据环形问题	2023-07-07 17:49:42 +08:00
Zheng Jie	66e24cfea0	代码优化：修改错别字	2023-07-07 17:36:38 +08:00
Zheng Jie	170d309978	Merge branch 'master' into deploy	2023-07-06 14:30:41 +08:00
Zheng Jie	1f09f74e61	新增重置用户密码功能	2023-07-06 14:24:44 +08:00
Zheng Jie	9edc5df08d	Merge branch 'master' into deploy	2023-07-05 11:08:58 +08:00
Zheng Jie	7ea91bebb6	Merge branch 'master' into deploy	2023-07-04 22:34:39 +08:00
Zheng Jie	ba00fd21ed	Merge branch 'master' into deploy # Conflicts: # README.md	2023-07-04 20:55:43 +08:00
Zheng Jie	d4736aaa77	Merge branch 'master' into deploy	2023-06-19 16:12:40 +08:00
Zheng Jie	13ddb22e1c	Merge branch 'master' into deploy	2023-05-26 14:44:39 +08:00
Zheng Jie	65c85de7ec	update	2023-05-26 14:42:40 +08:00
Zheng Jie	97383cc86f	update	2023-05-26 14:39:49 +08:00
Zheng Jie	eedf463e8e	update	2023-05-26 14:38:47 +08:00
Zheng Jie	f339e2a5d8	update	2023-05-26 14:36:21 +08:00
Zheng Jie	6dc44b74a4	update	2023-05-26 14:34:47 +08:00
Zheng Jie	3b84681c4b	广告优化	2023-05-06 11:10:45 +08:00
Zheng Jie	97c8066dbb	Merge branch 'master' into deploy	2023-04-27 13:24:54 +08:00
Zheng Jie	18437610b7	test ad	2022-10-25 11:19:07 +08:00
Zheng Jie	ea203cfa10	test ad	2022-10-25 11:17:30 +08:00
Zheng Jie	11662dcd46	test ad	2022-10-25 11:15:29 +08:00
Zheng Jie	792c05306a	test ad	2022-10-25 11:13:20 +08:00
Zheng Jie	20af998dfe	test ad	2022-10-25 11:11:05 +08:00
Zheng Jie	159e24537f	update	2022-08-24 13:51:59 +08:00
Zheng Jie	5a71ef7e0d	test	2022-08-24 13:45:21 +08:00
Zheng Jie	972cb5f85f	test	2022-08-24 13:43:13 +08:00
Zheng Jie	f0c82679bf	Merge remote-tracking branch 'origin/deploy' into deploy # Conflicts: # src/components/Ad/index.vue	2022-08-24 13:39:37 +08:00
Zheng Jie	4c50a23279	test	2022-08-24 13:38:22 +08:00
Zheng Jie	0551231c45	update	2022-08-22 09:43:25 +08:00
Zheng Jie	f744856aff	update	2022-08-22 09:34:51 +08:00
Zheng Jie	dd112fec77	Merge remote-tracking branch 'origin/deploy' into deploy	2022-08-09 16:11:11 +08:00
elunez	456f5e4a5c	[Bug修复](master): 修改swagger访问地址 (#122 ) (#123 ) Co-authored-by: 2hxst <1141169626@qq.com>	2022-08-09 15:53:28 +08:00
Zheng Jie	97201b84df	Merge branch 'master' of github.com:elunez/eladmin-web into deploy	2022-08-09 15:52:12 +08:00
Mr9eng	e4e72887ba	fix: 树形表格取消父级选择时，删除按钮还能删除子节点问题。 (#110 )	2022-08-09 15:41:58 +08:00
Zheng Jie	5362555d06	update	2022-08-05 17:57:26 +08:00
Zheng Jie	5c501a048a	update	2022-08-05 17:54:28 +08:00
Zheng Jie	de479a837b	update	2022-08-05 17:50:40 +08:00
Zheng Jie	35775bb798	update	2022-08-05 17:47:58 +08:00
Zheng Jie	f3650cd8f8	update	2022-08-05 17:42:27 +08:00
Zheng Jie	07a3c94e4f	update	2022-08-05 17:40:30 +08:00
Zheng Jie	cd0f9e9628	update	2022-08-05 17:39:56 +08:00
Zheng Jie	dd5a6c4bb5	update	2022-08-05 17:37:26 +08:00
Zheng Jie	f7edbf1f05	update	2022-08-05 17:34:17 +08:00
Zheng Jie	fa1ce408d4	update	2022-08-05 17:30:48 +08:00
Zheng Jie	6d606f855e	update	2022-08-05 17:25:52 +08:00
Zheng Jie	f89361f5f7	update	2022-08-02 20:43:16 +08:00
Zheng Jie	bf2d89dc1a	update	2022-08-02 20:39:24 +08:00
Zheng Jie	1729cf896e	update	2022-08-02 20:35:24 +08:00
Zheng Jie	a033c4592d	update	2022-08-02 15:01:20 +08:00
Zheng Jie	b1bb76f607	Merge branch 'master' into deploy # Conflicts: # .env.production # README.md	2022-08-02 14:04:56 +08:00
Zheng Jie	ea5ac0476e	update	2022-08-02 13:33:04 +08:00
Zheng Jie	54bbf6d1fb	Merge branch 'master' into deploy # Conflicts: # src/views/login.vue	2022-08-02 13:30:35 +08:00
Zheng Jie	183c0c5acf	update	2022-08-02 10:10:08 +08:00
Zheng Jie	18228ef862	update	2022-08-01 18:31:14 +08:00
Zheng Jie	fa8b8bcc22	update	2022-08-01 18:28:28 +08:00
Zheng Jie	27e01670ba	update	2022-08-01 18:23:14 +08:00
Zheng Jie	6ffcc5435f	update	2022-08-01 18:11:11 +08:00
Zheng Jie	325c8652d2	update	2022-08-01 18:07:27 +08:00
Zheng Jie	d75f006641	update	2022-08-01 17:44:35 +08:00
Zheng Jie	2a38d50e88	update	2022-08-01 17:41:18 +08:00
Zheng Jie	ff0aa185f1	update	2022-08-01 16:44:08 +08:00
Zheng Jie	92b292aa05	update	2022-08-01 10:53:58 +08:00
Zheng Jie	fdaa75d5a4	update	2022-08-01 10:52:32 +08:00
Zheng Jie	bbb6f45f39	update	2022-07-29 18:28:55 +08:00
Zheng Jie	b67b0d272d	update	2022-07-29 18:27:17 +08:00
Zheng Jie	2b1ea1e7a2	update	2022-07-29 18:26:41 +08:00
Zheng Jie	dbf21b3aff	update	2022-07-29 18:25:13 +08:00
Zheng Jie	73d312f873	update	2022-07-29 18:11:14 +08:00
Zheng Jie	a7c03882f4	update	2022-07-29 18:09:44 +08:00
Zheng Jie	5cc21ac695	update	2022-07-29 18:07:08 +08:00
Zheng Jie	0a54c2301a	update	2022-07-29 17:59:15 +08:00
Zheng Jie	9568c9a777	update	2022-07-29 17:50:39 +08:00
Zheng Jie	197d557e87	update	2022-07-29 17:46:31 +08:00
Zheng Jie	d508df1cc1	update	2022-07-29 17:41:50 +08:00
Zheng Jie	ed9df3b2ff	update	2022-07-29 17:39:32 +08:00
Zheng Jie	5c82de2403	update	2022-07-29 17:30:42 +08:00
Zheng Jie	7a1b10291e	update	2022-07-29 17:22:29 +08:00
Zheng Jie	842d37d80d	update	2022-07-29 14:19:34 +08:00
Zheng Jie	5c013311e8	update	2022-07-29 13:57:43 +08:00
Zheng Jie	bfb9fe84b1	update	2022-07-29 13:54:55 +08:00
Zheng Jie	6bf9906b27	update	2022-07-29 13:52:30 +08:00
Zheng Jie	b656275d7b	update	2022-07-29 13:40:46 +08:00
Zheng Jie	231171c5b3	update	2022-07-29 13:39:57 +08:00
Zheng Jie	c623b13d0b	update	2022-07-29 13:35:15 +08:00
Zheng Jie	07930da9e2	update	2022-07-29 13:26:41 +08:00
Zheng Jie	1e8e332a71	update	2022-07-29 13:24:14 +08:00
Zheng Jie	7f8b593128	update	2022-07-29 13:23:59 +08:00
Zheng Jie	64c577430e	update	2022-07-29 13:08:01 +08:00
Zheng Jie	55acfe0fdc	update	2022-07-29 13:05:39 +08:00
Zheng Jie	e5e9ff4471	update	2022-07-29 13:03:32 +08:00
Zheng Jie	ea0a8a4efc	update	2022-07-29 12:35:25 +08:00
Zheng Jie	09cc9f9cdf	update	2022-07-29 12:03:32 +08:00
Zheng Jie	25c4435c50	update	2022-07-29 12:01:01 +08:00
Zheng Jie	7b0422f829	update	2022-07-29 11:59:27 +08:00
Zheng Jie	58b3b28c36	update	2022-07-29 11:54:40 +08:00
Zheng Jie	82fc65e9e2	update	2022-07-29 11:49:53 +08:00
Zheng Jie	e9805a1b77	Merge branch 'master' into deploy	2022-07-24 22:37:32 +08:00
Zheng Jie	6ef98efb60	Merge branch 'master' into deploy	2022-07-24 22:19:03 +08:00
Zheng Jie	94783d9fc6	update	2022-07-22 13:52:05 +08:00
Zheng Jie	2fea143bd9	Merge branch 'master' into deploy # Conflicts: # src/settings.js	2022-07-22 13:45:09 +08:00
Zheng Jie	ad1002a06b	update	2022-07-15 11:07:29 +08:00
Zheng Jie	9b90e37dcd	update	2022-07-08 13:10:50 +08:00
Zheng Jie	4e91ae792d	Merge branch 'master' into deploy	2022-06-13 17:38:13 +08:00
Zheng Jie	f904fa7641	[新增功能](master): update	2022-06-08 11:08:51 +08:00
Zheng Jie	82c0d2156e	[新增功能](master): update	2022-06-07 17:44:43 +08:00
Zheng Jie	072a20c9fc	Merge branch 'master' into deploy	2022-06-07 17:34:06 +08:00
Zheng Jie	c3ed96296f	Merge branch 'master' into deploy	2022-06-01 10:15:44 +08:00
Zheng Jie	6bade995fe	update	2022-05-25 18:21:28 +08:00
Zheng Jie	0c81b66cd9	限制文件上传大小50KB	2022-05-25 11:35:43 +08:00
Zheng Jie	a0cfe3084e	update	2022-05-24 18:30:25 +08:00
Zheng Jie	e11383a425	Merge branch 'master' into deploy	2022-05-24 18:23:51 +08:00
Zheng Jie	9321d8c6c3	Merge branch 'master' into deploy	2022-05-24 18:18:22 +08:00
Zheng Jie	260f435d0e	Merge branch 'master' into deploy	2022-05-24 11:43:05 +08:00
Zheng Jie	862d809708	Merge branch 'master' into deploy # Conflicts: # README.md	2022-05-23 10:03:24 +08:00
Zheng Jie	fa1193a86e	Merge branch 'master' into deploy	2022-05-18 13:56:25 +08:00
Zheng Jie	7523925106	Merge branch 'master' into deploy	2022-05-18 13:54:30 +08:00
Zheng Jie	4fb81774c7	Merge branch 'master' into deploy	2022-05-18 13:52:00 +08:00
Zheng Jie	4f1af630d1	Merge branch 'master' into deploy	2022-04-12 09:46:16 +08:00
Zheng Jie	b8d030fa38	Merge branch 'master' into deploy	2022-03-22 16:35:20 +08:00
Zheng Jie	d6d2cf87a5	Merge branch 'master' into deploy # Conflicts: # .env.production # README.md	2022-03-22 13:29:15 +08:00
Zheng Jie	06f1f53dad	二级目录部署	2022-03-22 11:19:53 +08:00
Zheng Jie	337794ee6f	上传文件大小限制	2022-03-18 14:30:10 +08:00
Zheng Jie	31c465972e	去除百度统计	2022-03-13 21:52:28 +08:00
Zheng Jie	a9cf39a336	Merge branch 'master' into deploy	2022-03-02 10:00:19 +08:00
Zheng Jie	bfb8ca4c4d	Merge branch 'master' into deploy	2022-03-02 09:51:47 +08:00
Zheng Jie	7b8cc4c9ba	update	2022-02-27 10:53:34 +08:00
Zheng Jie	1ff0d86f95	update	2022-02-27 10:51:04 +08:00
Zheng Jie	cede3cf12a	update	2022-02-27 10:43:12 +08:00
Zheng Jie	4ad591131e	update	2022-02-27 10:38:49 +08:00
Zheng Jie	d646e9a531	Merge branch 'master' into deploy	2022-02-25 10:55:12 +08:00
Zheng Jie	6ed6bec8b3	Merge branch 'master' into deploy	2022-02-25 10:51:11 +08:00
Zheng Jie	e34fe60bb5	Merge branch 'master' into deploy	2022-01-18 14:54:26 +08:00
Zheng Jie	6597befc68	Merge branch 'master' into deploy	2021-12-30 16:55:06 +08:00
Zheng Jie	12be6a4f2c	迎合阿里云备案规则	2021-12-29 11:13:37 +08:00
Zheng Jie	1ef9ab619d	迎合阿里云备案规则	2021-12-29 11:02:41 +08:00
Zheng Jie	6089399de5	Merge branch 'master' into deploy # Conflicts: # README.md	2021-11-27 10:21:42 +08:00
Zheng Jie	1cecb3cfb4	Merge branch 'master' into deploy	2021-11-24 11:08:54 +08:00
Zheng Jie	79319b292b	Merge branch 'master' into deploy	2021-11-19 11:21:06 +08:00
Zheng Jie	c9fd78ee30	Merge branch 'master' into deploy	2021-11-16 21:27:08 +08:00
Zheng Jie	0a50a26be3	Merge branch 'master' into deploy	2021-06-07 15:47:54 +08:00
Zheng Jie	cc52edefd1	Merge branch 'master' into deploy	2021-03-31 11:07:42 +08:00
Zheng Jie	b458cd0736	Merge branch 'master' into deploy	2021-03-03 17:29:29 +08:00
Zheng Jie	2c60f27175	Merge branch 'master' into deploy	2021-03-03 14:49:29 +08:00
Zheng Jie	5bd03ab67f	Merge branch 'master' into deploy	2021-03-03 12:05:52 +08:00
Zheng Jie	b0f0a6e130	Merge branch 'master' into deploy	2021-03-02 19:27:58 +08:00
Zheng Jie	76c5bf588e	Merge branch 'master' into deploy	2021-03-01 18:03:11 +08:00
Zheng Jie	035167e508	Merge branch 'master' into deploy	2021-02-27 21:31:24 +08:00
Zheng Jie	3655497ace	Merge branch 'master' into deploy	2021-02-27 21:22:59 +08:00
zhengjie	36ca073c81	[代码优化](v2.6)：备案完成	2021-02-20 16:01:16 +08:00
zhengjie	16b4dfa6c0	[代码优化](v2.6)：备案	2021-02-18 11:06:55 +08:00
zhengjie	084818431a	[代码优化](v2.6)：update	2021-02-09 18:59:06 +08:00
zhengjie	e7ebdb71ee	[代码优化](v2.6)：update	2021-02-06 18:16:52 +08:00
zhengjie	1bac787019	[代码优化](v2.6)：update	2021-02-06 16:53:07 +08:00
zhengjie	6517e00b69	[代码优化](v2.6)：update	2021-02-05 17:35:32 +08:00
zhengjie	fa12a2ec18	[代码优化](v2.6)：加入百度统计	2021-02-03 17:12:59 +08:00
zhengjie	732b6ed1db	[代码优化](v2.6)：备案临时修改标题	2021-01-30 17:39:35 +08:00
zhengjie	1dc8c34504	Merge branch 'master' into deploy	2020-12-24 16:48:28 +08:00
zhengjie	770798ee71	Merge branch 'master' into deploy	2020-12-19 18:07:22 +08:00
zhengjie	14ec29e4c5	Merge branch 'master' into deploy	2020-12-12 23:06:42 +08:00
zhengjie	07bee16eee	Merge branch 'master' into deploy	2020-12-12 16:53:10 +08:00
zhengjie	035f28b63b	[代码优化](v2.6)：update	2020-12-11 23:23:24 +08:00
ZhengJie	9aa26a9996	Merge branch 'master' into deploy	2020-11-22 21:01:54 +08:00
ZhengJie	b423fbeebc	Merge branch 'master' into deploy	2020-11-22 20:49:53 +08:00
ZhengJie	5efa89e2e4	Merge branch 'master' into deploy	2020-11-16 19:27:10 +08:00
ZhengJie	4e5520ba25	[代码优化](v2.6)：角色管理选择菜单Bug修复	2020-11-16 18:28:13 +08:00
ZhengJie	3f51dc143e	Merge branch 'master' into deploy	2020-11-15 20:11:54 +08:00
ZhengJie	ea256201f5	Merge branch 'master' of github.com:elunez/eladmin-web into deploy	2020-11-09 20:04:55 +08:00
ZhengJie	74db4fb6e1	[代码优化](v2.6)：update	2020-11-09 20:04:05 +08:00
ZhengJie	7a37201b69	Merge branch 'master' into deploy	2020-11-06 22:47:26 +08:00
ZhengJie	c0e8d19035	Merge branch 'master' into deploy	2020-11-02 21:04:20 +08:00
ZhengJie	cd75c09c2e	Merge branch 'master' into deploy	2020-10-20 20:21:11 +08:00
ZhengJie	fac3078d8d	[代码优化](v2.6)：update	2020-10-11 23:29:13 +08:00
				`@@ -0,0 +1 @@`
				<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1690351561879" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10676" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M832 320H362.666667c-46.933333 0-85.333333 38.4-85.333334 85.333333v298.666667c0 46.933333 38.4 85.333333 85.333334 85.333333h149.333333l-21.333333 64h-74.666667c-17.066667 0-32 14.933333-32 32s14.933333 32 32 32h362.666667c17.066667 0 32-14.933333 32-32s-14.933333-32-32-32H704l-21.333333-64h149.333333c46.933333 0 85.333333-38.4 85.333333-85.333333V405.333333c0-46.933333-38.4-85.333333-85.333333-85.333333z" p-id="10677" fill="#bfbfbf"></path><path d="M320 885.333333c0-12.8 2.133333-25.6 6.4-36.266666-64-14.933333-113.066667-74.666667-113.066667-145.066667V405.333333c0-83.2 66.133333-149.333333 149.333334-149.333333h170.666666V192c0-46.933333-38.4-85.333333-85.333333-85.333333H192C145.066667 106.666667 106.666667 145.066667 106.666667 192v640c0 46.933333 38.4 85.333333 85.333333 85.333333h134.4c-4.266667-10.666667-6.4-21.333333-6.4-32z" p-id="10678" fill="#bfbfbf"></path></svg>