Merge pull request #32 from lixiangxiang1/main

fix:develop->main v1.0.0-release 's work

Author: duktig666

.env.production

@@ -2,5 +2,6 @@ ENV = 'production'
 
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
 VUE_APP_BASE_API  = 'http://127.0.0.1:8000'
+
 # 如果接口是 http 形式， wss 需要改为 ws
 VUE_APP_WS_API = 'wss://localhost:8000'

README.md

@@ -4,13 +4,13 @@ SMPE-ADMIN通用框架前端
 ## 项目简介
 一个基于[EL-ADMIN](https://el-admin.vip/)、Spring Boot 2.1.0 、 Mybatis Plus、JWT + Spring Security、Redis、Vue的前后端分离的后台管理系统
 
-**开发文档：**  待完善
+**[官方文档](https://sanyueruanjian.github.io/smpe-admin-doc/)**
 
 ## 项目源码
 
 |     |   后端源码  |   前端源码  |
 |---  |--- | --- |
-|  GitHub  | https://github.com/shiwei-Ren/smpe-admin |   https://github.com/shiwei-Ren/smpe-admin-web  |
+|  GitHub  | https://github.com/sanyueruanjian/smpe-admin |   https://github.com/sanyueruanjian/smpe-admin-web  |
 
 ### 项目结构
 
@@ -39,7 +39,7 @@ SMPE-ADMIN通用框架前端
 |-- vue.config.js  cli配置文件
 ```
 
-## 使用手册
+## 使用指南
 ### 用户账号密码
 
 - 管理员： ```admin```
@@ -78,9 +78,9 @@ npm run build
 4. [docker 构建centos7+git+nvm镜像，实现自主切换node版本统一部署前端vue项目](https://blog.csdn.net/qq_42937522/article/details/108702775)
 
 # 鸣谢
-- [@三月软件](http://www.marchsoft.cn/)提供技术支持
-- 主要参考[EL-ADMIN](https://el-admin.vip/)
-- 由[@Nancy](https://github.com/NancyDancy)、[@shiwei-Ren](https://github.com/shiwei-Ren)、[@jiaoqianjin](https://github.com/jiaoqianjin)、[@mingDn](https://github.com/mingDn)参与前端初版的开发维护
-
-
+- 感谢 [EL-ADMIN](https://el-admin.vip/) 开源框架
+- 感谢[@shiwei-Ren](https://github.com/shiwei-Ren)、[@jiaoqianjin](https://github.com/jiaoqianjin)、[@Nancy](https://github.com/NancyDancy)参与初版的开发维护
+- 感谢每一位为 SMPE-ADMIN 做出过贡献的开发者
 
+# 反馈交流
+QQ交流群：571506692

src/api/data.js

@@ -9,6 +9,8 @@ export function initData(url, params) {
 }
 
 export function download(url, params) {
+  console.log(url, '2')
+  // console.log(params,"2")
   return request({
     url: url + '?' + qs.stringify(params, { indices: false }),
     method: 'get',

src/api/monitor/log.js

@@ -0,0 +1,22 @@
+import request from '@/utils/request'
+
+export function getErrDetail(id) {
+  return request({
+    url: 'api/logs/error/' + id,
+    method: 'get'
+  })
+}
+
+export function delAllError() {
+  return request({
+    url: 'api/logs/del/error',
+    method: 'delete'
+  })
+}
+
+export function delAllInfo() {
+  return request({
+    url: 'api/logs/del/info',
+    method: 'delete'
+  })
+}

src/api/system/timing.js

@@ -0,0 +1,41 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/jobs',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/jobs',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/jobs',
+    method: 'put',
+    data
+  })
+}
+
+export function updateIsPause(id) {
+  return request({
+    url: 'api/jobs/' + id,
+    method: 'put'
+  })
+}
+
+export function execution(id) {
+  return request({
+    url: 'api/jobs/exec/' + id,
+    method: 'put'
+  })
+}
+
+export default { del, add, edit, updateIsPause, execution }

src/components/Crud/crud.js

@@ -120,6 +120,9 @@ function CRUD(options) {
     },
     // 搜索
     toQuery() {
+      if (crud.getQueryParams().startTime) {
+        crud.query.createTime = null
+      }
       crud.page.page = 1
       crud.refresh()
     },
@@ -132,8 +135,6 @@ function CRUD(options) {
         crud.loading = true
         // 请求数据
         initData(crud.url, crud.getQueryParams()).then(res => {
-          // console.log(123456)
-          // console.log(res)
           const table = crud.getTable()
           if (table && table.lazy) { // 懒加载子节点数据，清掉已加载的数据
             table.store.states.treeData = {}
@@ -147,6 +148,9 @@ function CRUD(options) {
             crud.loading = false
             callVmHook(crud, CRUD.HOOK.afterRefresh)
           }, crud.time)
+          // 清除上次搜索的条件
+          crud.query.startTime = null
+          crud.query.endTime = null
           resolve(data)
         }).catch(err => {
           crud.loading = false

src/layout/components/Navbar.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+    <hamburger
+      id="hamburger-container"
+      :is-active="sidebar.opened"
+      class="hamburger-container"
+      @toggleClick="toggleSideBar"
+    />
 
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
 
@@ -18,7 +23,7 @@
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="user.avatarName ? baseApi + '/avatar/' + user.avatarName : Avatar" class="user-avatar">
+          <img :src="user.avatarPath ? baseApi + '/api/file/download/' + user.avatarPath : Avatar" class="user-avatar">
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
@@ -106,85 +111,85 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.navbar {
-  height: 50px;
-  overflow: hidden;
-  position: relative;
-  background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
-
-  .hamburger-container {
-    line-height: 46px;
-    height: 100%;
-    float: left;
-    cursor: pointer;
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
-
-    &:hover {
-      background: rgba(0, 0, 0, .025)
-    }
-  }
-
-  .breadcrumb-container {
-    float: left;
-  }
-
-  .errLog-container {
-    display: inline-block;
-    vertical-align: top;
-  }
+  .navbar {
+    height: 50px;
+    overflow: hidden;
+    position: relative;
+    background: #fff;
+    box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
+
+    .hamburger-container {
+      line-height: 46px;
+      height: 100%;
+      float: left;
+      cursor: pointer;
+      transition: background .3s;
+      -webkit-tap-highlight-color: transparent;
 
-  .right-menu {
-    float: right;
-    height: 100%;
-    line-height: 50px;
+      &:hover {
+        background: rgba(0, 0, 0, .025)
+      }
+    }
 
-    &:focus {
-      outline: none;
+    .breadcrumb-container {
+      float: left;
     }
 
-    .right-menu-item {
+    .errLog-container {
       display: inline-block;
-      padding: 0 8px;
-      height: 100%;
-      font-size: 18px;
-      color: #5a5e66;
-      vertical-align: text-bottom;
+      vertical-align: top;
+    }
 
-      &.hover-effect {
-        cursor: pointer;
-        transition: background .3s;
+    .right-menu {
+      float: right;
+      height: 100%;
+      line-height: 50px;
 
-        &:hover {
-          background: rgba(0, 0, 0, .025)
-        }
+      &:focus {
+        outline: none;
       }
-    }
-
-    .avatar-container {
-      margin-right: 30px;
 
-      .avatar-wrapper {
-        margin-top: 5px;
-        position: relative;
+      .right-menu-item {
+        display: inline-block;
+        padding: 0 8px;
+        height: 100%;
+        font-size: 18px;
+        color: #5a5e66;
+        vertical-align: text-bottom;
 
-        .user-avatar {
+        &.hover-effect {
           cursor: pointer;
-          width: 40px;
-          height: 40px;
-          border-radius: 10px;
+          transition: background .3s;
+
+          &:hover {
+            background: rgba(0, 0, 0, .025)
+          }
         }
+      }
 
-        .el-icon-caret-bottom {
-          cursor: pointer;
-          position: absolute;
-          right: -20px;
-          top: 25px;
-          font-size: 12px;
+      .avatar-container {
+        margin-right: 30px;
+
+        .avatar-wrapper {
+          margin-top: 5px;
+          position: relative;
+
+          .user-avatar {
+            cursor: pointer;
+            width: 40px;
+            height: 40px;
+            border-radius: 10px;
+          }
+
+          .el-icon-caret-bottom {
+            cursor: pointer;
+            position: absolute;
+            right: -20px;
+            top: 25px;
+            font-size: 12px;
+          }
         }
       }
     }
   }
-}
 </style>

src/layout/components/Sidebar/Logo.vue

@@ -15,6 +15,7 @@
 
 <script>
 import Logo from '@/assets/images/logo.png'
+import Setting from '@/settings'
 export default {
   name: 'SidebarLogo',
   props: {
@@ -25,7 +26,7 @@ export default {
   },
   data() {
     return {
-      title: '三月软件-后台管理',
+      title: Setting.logoTitle,
       logo: Logo
     }
   }