Browse Source

Merge branch 'master' into pgsqlDevelop

# Conflicts:
#	server/core/server_other.go
main
蒋吉兆 3 years ago
parent
commit
6e17a11bcd
  1. 2
      README.md
  2. 3
      server/core/server_other.go
  3. 2
      web/src/view/dashboard/dashboardCharts/echartsLine.vue
  4. 2
      web/src/view/superAdmin/api/api.vue

2
README.md

@ -41,6 +41,8 @@
<img src="https://qmplusimg.henrongyi.top/%E6%8E%88%E6%9D%83.png" width="1000"> <img src="https://qmplusimg.henrongyi.top/%E6%8E%88%E6%9D%83.png" width="1000">
5.如果您需要服务器的话 2C4G8M 80GB 腾讯云 一年70 三年198 在这里购买:https://curl.qcloud.com/tJrn0bK0
## 1. 基本介绍 ## 1. 基本介绍
### 1.1 项目介绍 ### 1.1 项目介绍

3
server/core/server_other.go

@ -4,9 +4,10 @@
package core package core
import ( import (
"time"
"github.com/fvbock/endless" "github.com/fvbock/endless"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"time"
) )
func initServer(address string, router *gin.Engine) server { func initServer(address string, router *gin.Engine) server {

2
web/src/view/dashboard/dashboardCharts/echartsLine.vue

@ -10,7 +10,7 @@
</div> </div>
</template> </template>
<script> <script>
import echarts from 'echarts'
import * as echarts from 'echarts'
import { toRaw } from 'vue' import { toRaw } from 'vue'
import 'echarts/theme/macarons' import 'echarts/theme/macarons'

2
web/src/view/superAdmin/api/api.vue

@ -90,7 +90,7 @@
</div> </div>
<el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="dialogTitle"> <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="dialogTitle">
<warning-bar title="新增API,需要在角色管理内篇日志权限才可使用" />
<warning-bar title="新增API,需要在角色管理内配置权限才可使用" />
<el-form ref="apiForm" :model="form" :rules="rules" label-width="80px"> <el-form ref="apiForm" :model="form" :rules="rules" label-width="80px">
<el-form-item label="路径" prop="path"> <el-form-item label="路径" prop="path">
<el-input v-model="form.path" autocomplete="off" /> <el-input v-model="form.path" autocomplete="off" />

Loading…
Cancel
Save