Merge branch 'develop' #4

# Conflicts:
#	laravel/readme/1. 2018-11-16-RESTFull API 风格开发.md

Author: lisgroup

README.md

@@ -9,14 +9,14 @@ Laravel Vue admin 管理系统
 
 ### 主要技术栈
 
-- 后端框架： Laravel 5.5.x
+- 后端框架： Laravel 6.x
 - 前端 MVVM 框架： Vue 2.6.10
 - 前端构建： Vue-cli
 - 路由： Vue-Router 3.x
 - 数据交互： Axios
 - 代码风格检测： Eslint
 - UI框架： Element-UI 2.7.2
-- Laravel 的运行环境要求 PHP5.6 以上。
+- Laravel 的运行环境要求 PHP7.2 以上。
 
 ## 案例演示
 

admin/.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://127.0.0.1:8000'
+VUE_APP_BASE_API = 'http://127.0.0.1:5200'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

admin/package.json

@@ -19,30 +19,30 @@
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -w -r 0"
   },
   "dependencies": {
-    "axios": ">=0.18.1",
-    "echarts": "^4.2.1",
+    "axios": "^0.19.2",
+    "echarts": "^4.8.0",
     "element-ui": "2.7.2",
     "js-cookie": "2.2.0",
-    "layui-src": "^2.5.4",
-    "mavon-editor": "^2.7.5",
+    "layui-src": "^2.5.5",
+    "mavon-editor": "^2.9.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
     "vue": "2.6.10",
-    "vue-clipboard2": "^0.3.0",
+    "vue-clipboard2": "^0.3.1",
     "vue-router": "3.0.6",
     "vuex": "3.1.0",
-    "xlsx": "^0.14.3"
+    "xlsx": "^0.14.5"
   },
   "devDependencies": {
     "@babel/core": "7.0.0",
     "@babel/register": "7.0.0",
     "@vue/cli-plugin-babel": "3.6.0",
-    "@vue/cli-plugin-eslint": "^3.9.1",
+    "@vue/cli-plugin-eslint": "^3.12.1",
     "@vue/cli-plugin-unit-jest": "3.6.3",
     "@vue/cli-service": "3.6.0",
     "@vue/test-utils": "1.0.0-beta.29",
-    "autoprefixer": "^9.5.1",
+    "autoprefixer": "^9.8.0",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.0.1",
     "babel-jest": "23.6.0",
@@ -52,9 +52,9 @@
     "eslint-plugin-vue": "5.2.2",
     "html-webpack-plugin": "3.2.0",
     "mockjs": "1.0.1-beta3",
-    "node-sass": "^4.9.0",
+    "node-sass": "^4.14.1",
     "runjs": "^4.3.2",
-    "sass-loader": "^7.1.0",
+    "sass-loader": "^7.3.1",
     "script-ext-html-webpack-plugin": "2.1.3",
     "script-loader": "0.7.2",
     "serve-static": "^1.13.2",

admin/src/components/common/navBar.vue

@@ -5,7 +5,14 @@
         <el-col :xs="6" :sm="6" :md="4" :lg="4" :xl="4">
           <div class="grid-content">
             <el-menu-item index="1">
-              <router-link :to="{name: 'index'}">公交-首页</router-link>
+              <router-link :to="{name: 'bus'}">首页</router-link>
+            </el-menu-item>
+          </div>
+        </el-col>
+        <el-col :xs="6" :sm="6" :md="4" :lg="4" :xl="4">
+          <div class="grid-content">
+            <el-menu-item index="1">
+              <router-link :to="{name: 'md'}">Markdown</router-link>
             </el-menu-item>
           </div>
         </el-col>

admin/src/layout/components/Footer.vue

@@ -0,0 +1,49 @@
+<template>
+  <footer class="footer">
+    <a href="http://www.beian.miit.gov.cn/" target="_blank">苏ICP备19019285号-1</a>
+    <a href="https://www.guke1.com/#/">© guke1.com</a>
+    <span class="copy-right">版权所有</span>
+  </footer>
+</template>
+
+<script>
+export default {
+  name: 'Footer',
+  data() {
+    return {
+      activeIndex: ''
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .footer {
+    background-color: #9caebf;
+    color: #fff;
+    text-align: center;
+    margin-top: 30px;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 50px;
+    z-index: 9999;
+  }
+  .footer > a {
+    color: white;
+    margin: 0 10px 0 0;
+    text-align: center;
+    display: inline-block;
+  }
+  a:hover {
+    color: #6289ad;
+  }
+
+  .grid-content a{
+    display: block;
+  }
+  ul > li > a{
+    display: block;
+  }
+</style>

admin/src/layout/components/index.js

@@ -1,3 +1,4 @@
 export { default as Navbar } from './Navbar'
 export { default as Sidebar } from './Sidebar'
 export { default as AppMain } from './AppMain'
+export { default as Footer } from './Footer'

admin/src/permission.js

@@ -9,7 +9,7 @@ import getPageTitle from '@/utils/get-page-title'
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
 // 不重定向白名单
-const whiteList = ['/login', '/index', '/line', '/home', '/404', '/', '', '/echarts', '/md', '/out', '/excel', '/upload']
+const whiteList = ['/login', '/index', '/bus', '/line', '/home', '/404', '/', '', '/echarts', '/md', '/out', '/excel', '/upload']
 router.beforeEach(async(to, from, next) => {
   // start progress bar
   NProgress.start()

admin/src/router/index.js

@@ -212,7 +212,8 @@ export const asyncRoutes = [...routeAdmin, ...routeSuper, ...routeTest]
 
 // 基础路由
 const routeBase = [
-  { path: '/', name: 'index', component: () => import('@/views/home/index'), hidden: true },
+  { path: '/', name: 'bus', component: () => import('@/views/home/index'), hidden: true },
+  { path: '/bus', name: 'bus', component: () => import('@/views/home/index'), hidden: true },
   { path: '/line', name: 'line', component: () => import('@/views/home/line'), hidden: true },
   { path: '/home', component: () => import('@/views/home/home'), hidden: true },
   { path: '/md', name: 'md', component: () => import('@/views/markdown/index'), hidden: true },

admin/src/settings.js

@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: 'Laravel-vue-admin 后台管理系统',
+  title: '个人技术分享',
 
   /**
    * @type {boolean} true | false

admin/src/views/api_excel/index.vue

@@ -342,13 +342,21 @@ export default {
       })
     },
     initWebSocket() { // 初始化 weosocket
+      const that = this
       if ('WebSocket' in window) {
         const url = process.env.VUE_APP_WEBSOCKET + '?action=api_excel&token=' + getToken() + '&page=' + this.currentpage + '&perPage=' + this.perpage
         this.websock = new WebSocket(url)
         this.websock.onmessage = this.onmessage
         this.websock.onopen = this.onopen
         this.websock.onerror = this.onerror
         this.websock.onclose = this.close
+
+        setInterval(function() {
+          if (that.websock && that.websock.readyState === that.websock.OPEN) {
+            // console.log('inSend')
+            that.send('{"page":1}')
+          }
+        }, 5000)
       } else {
         this.fetchData()
         // 浏览器不支持 WebSocket，使用 ajax 轮询
@@ -359,34 +367,36 @@ export default {
       // const actions = { 'id': '7' }
       // const rs = this.send(JSON.stringify(actions))
       // console.log(rs)
+      setTimeout(() => {
+        this.reload = false
+        this.reload_name = '刷新'
+      }, 800)
     },
     onerror() {
       // 连接建立失败, 发送 http 请求获取数据
       // this.initWebSocket()
       this.fetchData()
     },
     onmessage(e) { // 数据接收
-      // console.log(e.data)
       const data = JSON.parse(e.data)
-      // this.list[2].rate = parseInt(data.data.rate)
-      // console.log(this.list[2].rate)
-      // console.log(data)
-      // websocket 返回的数据
-      this.list = data.data.data
-      this.listLoading = false
-      this.total = data.data.total
-      this.url = data.data.appUrl
-      // console.log('type', Object.prototype.toString.call(this.list))
-      setTimeout(() => {
-        this.reload = false
-        this.reload_name = '刷新'
-      }, 800)
+      // console.log(data.data)
+      if (data && data.data) {
+        // this.list[2].rate = parseInt(data.data.rate)
+        // console.log(this.list[2].rate)
+        // console.log(data)
+        // websocket 返回的数据
+        this.list = data.data.data
+        this.listLoading = false
+        this.total = data.data.total
+        this.url = data.data.appUrl
+        // console.log('type', Object.prototype.toString.call(this.list))
+      }
     },
     send(Data) {
       this.websock.send(Data)
     },
     close() { // 关闭
-      // console.log('断开连接')
+      console.log('断开连接')
     },
     download(index, row) {
       window.location.href = this.url + row.finish_url