tangzheng/totus-nline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
tangzh 2025-07-11 21:58:15 +08:00
parent 9e709f0a10
commit bd214436d8
7 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-web/.env.production
View File

@ -2,6 +2,6 @@ ENV = 'production'
# 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
VUE_APP_BASE_API = 'http://121.37.139.13:8080' VUE_APP_BASE_API = 'https://online.totustec.com/api'
# 如果接口是 http 形式， wss 需要改为 ws # 如果接口是 http 形式， wss 需要改为 ws
VUE_APP_WS_API = 'ws://121.37.139.13:8080' VUE_APP_WS_API = 'wss://online.totustec.com/api'

4
eladmin-web/src/router/routers.js
View File

@ -61,8 +61,8 @@ export const constantRouterMap = [
] ]
export default new Router({ export default new Router({
// mode: 'hash', mode: 'hash',
mode: 'history', // mode: 'history',
scrollBehavior: () => ({ y: 0 }), scrollBehavior: () => ({ y: 0 }),
routes: constantRouterMap routes: constantRouterMap
}) })

2
eladmin-web/src/store/modules/api.js
View File

@ -19,7 +19,7 @@ const api = {
// 文件上传 // 文件上传
fileUploadApi: baseUrl + '/api/localStorage', fileUploadApi: baseUrl + '/api/localStorage',
// baseUrl， // baseUrl，
baseApi: baseUrl baseApi: baseUrl.replace('api', 'upload')
} }
} }

11
eladmin-web/src/views/bus/busDevice/index.vue
View File

@ -99,7 +99,6 @@
<script> <script>
import crudBusDevice, { getQrCode } from '@/api/bus/busDevice/busDevice' import crudBusDevice, { getQrCode } from '@/api/bus/busDevice/busDevice'
import commandPage from '@/views/bus/busDeviceCommand/index'
import CRUD, { presenter, header, form, crud } from '@crud/crud' import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation' import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation' import crudOperation from '@crud/CRUD.operation'
@ -110,7 +109,7 @@ import {mapGetters} from "vuex";
const defaultForm = { id: null, deviceSn: null, model: null, brand: null, firmwareVersion: null, location: null, status: null, onlineTime: null, offlineTime: null, totalPrintTime: null, remark: null, type: null, createBy: null, updateBy: null, createTime: null, updateTime: null } const defaultForm = { id: null, deviceSn: null, model: null, brand: null, firmwareVersion: null, location: null, status: null, onlineTime: null, offlineTime: null, totalPrintTime: null, remark: null, type: null, createBy: null, updateBy: null, createTime: null, updateTime: null }
export default { export default {
name: 'BusDevice', name: 'BusDevice',
components: { pagination, crudOperation, rrOperation, udOperation, commandPage }, components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() { cruds() {
return CRUD({ title: '', url: 'api/busDevice', idField: 'id', sort: 'id,desc', crudMethod: { ...crudBusDevice }}) return CRUD({ title: '', url: 'api/busDevice', idField: 'id', sort: 'id,desc', crudMethod: { ...crudBusDevice }})
@ -156,10 +155,10 @@ export default {
this.qrCodeUrl = res this.qrCodeUrl = res
}) })
}, },
openCommandData(id) { // openCommandData(id) {
this.showCommandData = true // this.showCommandData = true
this.deviceId = id // this.deviceId = id
}, // },
closeCommandPage() { closeCommandPage() {
this.showCommandData = false this.showCommandData = false
}, },

4
eladmin-web/src/views/login.vue
View File

@ -56,8 +56,8 @@ export default {
codeUrl: '', codeUrl: '',
cookiePass: '', cookiePass: '',
loginForm: { loginForm: {
username: 'admin', username: '',
password: '123456', password: '',
rememberMe: false, rememberMe: false,
code: '', code: '',
uuid: '' uuid: ''

8
eladmin/eladmin-system/src/main/resources/config/application-dev.yml
View File

@ -7,9 +7,9 @@ spring:
druid: druid:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.p6spy.engine.spy.P6SpyDriver driverClassName: com.p6spy.engine.spy.P6SpyDriver
url: jdbc:p6spy:mysql://121.37.139.13:3306/totus-online?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false url: jdbc:p6spy:mysql://localhost:3306/totus_online?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username: root username: root
password: minxianrui password: Totusonline+++
# 初始连接数，建议设置为与最小空闲连接数相同 # 初始连接数，建议设置为与最小空闲连接数相同
initial-size: 20 initial-size: 20
# 最小空闲连接数，保持足够的空闲连接以应对请求 # 最小空闲连接数，保持足够的空闲连接以应对请求
@ -123,8 +123,8 @@ file:
path: ~/file/ path: ~/file/
avatar: ~/avatar/ avatar: ~/avatar/
linux: linux:
path: /www/wwwroot/online/upload/file/ path: /www/wwwroot/online/115.29.224.107/upload/file/
avatar: /www/wwwroot/online/upload/avatar/ avatar: /www/wwwroot/online/115.29.224.107/upload/avatar/
windows: windows:
path: /eladmin/eladmin-upload/file/ path: /eladmin/eladmin-upload/file/
avatar: /eladmin/eladmin-upload/avatar/ avatar: /eladmin/eladmin-upload/avatar/

2
eladmin/eladmin-system/src/main/resources/config/application.yml
View File

@ -68,4 +68,4 @@ logging:
org.springframework.boot.autoconfigure: ERROR org.springframework.boot.autoconfigure: ERROR
config: classpath:logback-spring.xml config: classpath:logback-spring.xml
file: file:
path: ./online_log path: ./logs