FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2021-11-07 16:45:13 +08:00
parent 70b1d5c43b 7c3cb629de
commit 3786d753a0
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standardWarning.vue
+2 -2
View File
@@ -326,8 +326,8 @@
:pageSize="pageConfig.oldStandPageSize" :pageSize="pageConfig.oldStandPageSize"
:total="pageConfig.count4" :total="pageConfig.count4"
autoSize autoSize
@pageChange="page => handlePageChange('oldItems', page)" @pageChange="page => handlePageChange('oldStand', page)"
@pageSizeChange="pageSize => handlePageSizeChange('oldItems', pageSize)"></pagination> @pageSizeChange="pageSize => handlePageSizeChange('oldStand', pageSize)"></pagination>
</div> </div>
</div> </div>
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
src/sysConfig/index.js
+4 -3
View File
@@ -6,9 +6,10 @@
// 服务器地址 // 服务器地址
// const devIp = '39.98.140.126' // const devIp = '39.98.140.126'
// const devInterfacePORT = '10005' // const devInterfacePORT = '10005'
const devIp = '192.168.10.50' // const devIp = '192.168.10.249'
// const devIp = '62.234.136.153' const devIp = '62.234.136.153'
const devInterfacePORT = '9999' // const devInterfacePORT = '9999'
const devInterfacePORT = '8033'
// 配置 idm 认证 // 配置 idm 认证
const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri=' const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
// 配置 前端服务 // 配置 前端服务