liu_li
/
yxk-storeroom-system
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

0430需求更新

master
xuhuajiao 9 months ago
parent
c9bfd28013
commit
5442e55d63
8 changed files with 70 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      .env.development
  2. 6
      .env.production
  3. 31
      public/index.html
  4. 9
      public/static/config.js
  5. 2
      src/assets/styles/yxk-admin.scss
  6. 57
      src/store/modules/api.js
  7. 3
      src/utils/request.js
  8. 6
      src/views/system/role/index.vue

11
.env.development
View File

@ -6,15 +6,12 @@ ENV = 'development'
# VUE_APP_BASE_API = 'http://192.168.99.107:7077' # VUE_APP_BASE_API = 'http://192.168.99.107:7077'
# VUE_APP_WS_API = 'ws://192.168.99.107:7077' # VUE_APP_WS_API = 'ws://192.168.99.107:7077'
VUE_APP_CAMERA_API = '192.168.99.107:3000' VUE_APP_CAMERA_API = '192.168.99.107:3000'
# VUE_APP_BASE_API = 'http://192.168.99.107:7070'
# VUE_APP_WS_API = 'ws://192.168.99.107:7070'
VUE_APP_BASE_API = 'http://192.168.99.107:7070'
VUE_APP_WS_API = 'ws://192.168.99.107:7070'
# 许镇-本地服地址 # 许镇-本地服地址
#VUE_APP_BASE_API = 'http://192.168.99.84:7070'
#VUE_APP_WS_API = 'ws://192.168.99.84:7070'
VUE_APP_BASE_API = 'http://192.168.99.67:7070'
VUE_APP_WS_API = 'ws://192.168.99.67:7070'
#VUE_APP_BASE_API = 'http://192.168.99.67:7070'
#VUE_APP_WS_API = 'ws://192.168.99.67:7070'
# 是否启用 babel-plugin-dynamic-import-node插件 # 是否启用 babel-plugin-dynamic-import-node插件

6
.env.production
View File

@ -3,7 +3,13 @@ ENV = 'production'
# 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
# VUE_APP_BASE_API = 'https://openapitest.aiyxlib.com' # VUE_APP_BASE_API = 'https://openapitest.aiyxlib.com'
# 火箭军
VUE_APP_BASE_API = 'http://192.168.1.100:7070' VUE_APP_BASE_API = 'http://192.168.1.100:7070'
# VUE_APP_BASE_API = 'http://192.168.99.107:7070'
# 如果接口是 http 形式， wss 需要改为 ws # 如果接口是 http 形式， wss 需要改为 ws
# 火箭军
VUE_APP_WS_API = 'ws://192.168.1.100:7071' VUE_APP_WS_API = 'ws://192.168.1.100:7071'
VUE_APP_CAMERA_API = '192.168.1.100:3000' VUE_APP_CAMERA_API = '192.168.1.100:3000'
# VUE_APP_WS_API = 'ws://192.168.99.107:7071'
# VUE_APP_CAMERA_API = '192.168.1.107:3000'

31
public/index.html
View File

@ -1,15 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<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.svg" type="image/svg+xml">
<title><%= webpackConfig.name %></title>
</head>
<body>
<div id="app"></div>
</body>
</html>
<!DOCTYPE html>
<html>
<head>
<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.svg" type="image/svg+xml">
<title><%= webpackConfig.name %></title>
<script type="text/javascript" src="/static/config.js"></script>
</head>
<body>
<div id="app"></div>
</body>
</html>

9
public/static/config.js
View File

@ -0,0 +1,9 @@
window.g = {
AXIOS_TIMEOUT: 10000,
ApiUrl: 'http://192.168.1.100:7070', // 配置服务器地址,
// ParentPage: { // 后续看需求配置
// CrossDomainProxyUrl: '/Home/CrossDomainProxy',
// BtnsApi: '/api/services/app/Authorization/GetBtns',
// OrgsApi: '/api/services/app/authorization/GetOrgsByUserId'
// },
}

2
src/assets/styles/yxk-admin.scss
View File

@ -516,7 +516,7 @@
content: ""; content: "";
width: 134px; width: 134px;
height: 63px; height: 63px;
z-index: 99;
z-index: 101;
} }
&::before{ &::before{
left: -6px; left: -6px;

57
src/store/modules/api.js
View File

@ -1,28 +1,29 @@
// 适配 Nginx 反向代理
const baseUrl = process.env.VUE_APP_BASE_API === '/' ? '' : process.env.VUE_APP_BASE_API
const api = {
state: {
// 部署包上传
deployUploadApi: baseUrl + '/api/deploy/upload',
// SQL脚本上传
databaseUploadApi: baseUrl + '/api/database/upload',
// 实时控制台
socketApi: baseUrl + '/websocket?token=kl',
// 图片上传
imagesUploadApi: baseUrl + '/api/localStorage/pictures',
// 修改头像
updateAvatarApi: baseUrl + '/api/users/updateAvatar',
// 上传文件到七牛云
qiNiuUploadApi: baseUrl + '/api/qiNiuContent',
// Sql 监控
sqlApi: baseUrl + '/druid/index.html',
// swagger
swaggerApi: baseUrl + '/swagger-ui.html',
// 文件上传
fileUploadApi: baseUrl + '/api/localStorage',
// baseUrl，
baseApi: baseUrl
}
}
export default api
// 适配 Nginx 反向代理
// const baseUrl = process.env.VUE_APP_BASE_API === '/' ? '' : process.env.VUE_APP_BASE_API
const baseUrl = process.env.NODE_ENV === 'production' ? window.g.ApiUrl : process.env.VUE_APP_BASE_API
const api = {
state: {
// 部署包上传
deployUploadApi: baseUrl + '/api/deploy/upload',
// SQL脚本上传
databaseUploadApi: baseUrl + '/api/database/upload',
// 实时控制台
socketApi: baseUrl + '/websocket?token=kl',
// 图片上传
imagesUploadApi: baseUrl + '/api/localStorage/pictures',
// 修改头像
updateAvatarApi: baseUrl + '/api/users/updateAvatar',
// 上传文件到七牛云
qiNiuUploadApi: baseUrl + '/api/qiNiuContent',
// Sql 监控
sqlApi: baseUrl + '/druid/index.html',
// swagger
swaggerApi: baseUrl + '/swagger-ui.html',
// 文件上传
fileUploadApi: baseUrl + '/api/localStorage',
// baseUrl，
baseApi: baseUrl
}
}
export default api

3
src/utils/request.js
View File

@ -10,7 +10,8 @@ import { reject } from 'core-js/fn/promise'
// 创建axios实例 // 创建axios实例
const service = axios.create({ const service = axios.create({
baseURL: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_API : '/', // api 的 base_url
baseURL: process.env.NODE_ENV === 'production' ? window.g.ApiUrl : '/', // api 的 base_url
// baseURL: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_API : '/', // api 的 base_url
// baseURL: process.env.NODE_ENV === 'production' ? 'http://192.168.99.84:7070' : '/', // api 的 base_url // baseURL: process.env.NODE_ENV === 'production' ? 'http://192.168.99.84:7070' : '/', // api 的 base_url
timeout: Config.timeout // 请求超时时间 timeout: Config.timeout // 请求超时时间

6
src/views/system/role/index.vue
View File

@ -64,10 +64,10 @@
<el-table ref="table" v-loading="crud.loading" highlight-current-row style="width: 100%;" height="calc(100vh - 400px)" :data="crud.data" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange"> <el-table ref="table" v-loading="crud.loading" highlight-current-row style="width: 100%;" height="calc(100vh - 400px)" :data="crud.data" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
<el-table-column :selectable="checkboxT" type="selection" align="center" width="55" /> <el-table-column :selectable="checkboxT" type="selection" align="center" width="55" />
<el-table-column prop="name" label="名称" /> <el-table-column prop="name" label="名称" />
<el-table-column prop="dataScope" label="数据权限" />
<el-table-column prop="level" label="角色级别" />
<!-- <el-table-column prop="dataScope" label="数据权限" />
<el-table-column prop="level" label="角色级别" /> -->
<el-table-column :show-overflow-tooltip="true" prop="description" label="描述" /> <el-table-column :show-overflow-tooltip="true" prop="description" label="描述" />
<el-table-column :show-overflow-tooltip="true" width="135px" prop="createTime" label="创建日期">
<el-table-column :show-overflow-tooltip="true" width="180px" prop="createTime" label="创建日期">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.createTime | parseTime }}</div> <div>{{ scope.row.createTime | parseTime }}</div>
</template> </template>

Write Preview
Loading…
Cancel
Save