joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-11-12 09:55:07 +08:00
commit 584d7cc5f4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/theme/foshan_01/menus/dialog/routeSelection.vue
View File

@ -21,8 +21,8 @@
<el-table-column prop="settable" label="状态" style="margin-left:30px;" width="100px"> <el-table-column prop="settable" label="状态" style="margin-left:30px;" width="100px">
<!--<template slot-scope="scope">--> <!--<template slot-scope="scope">-->
<!--<span>{{ scope.row.settable == 1? '允许选排':'不能选排' }}</span>--> <!--<span>{{ scope.row.settable == 1? '允许选排':'不能选排' }}</span>-->
<span>允许选排</span>
<!--</template>--> <!--</template>-->
<span>允许选排</span>
</el-table-column> </el-table-column>
<el-table-column style="margin-left:30px;" /> <el-table-column style="margin-left:30px;" />
</el-table> </el-table>

2
src/utils/baseUrl.js
View File

@ -5,7 +5,7 @@ export function getBaseUrl() {
BASE_API = 'https://test.joylink.club/jlcloud'; BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.8.107:9000'; // 袁琪 // BASE_API = 'http://192.168.8.107:9000'; // 袁琪
// BASE_API = 'http://192.168.8.114:9000'; // 旭强 // BASE_API = 'http://192.168.8.114:9000'; // 旭强
// BASE_API = 'http://192.168.8.109:9000'; // 张赛 // BASE_API = 'http://192.168.8.119:9000'; // 张赛
// BASE_API = 'http://192.168.8.110:9000'; // 杜康 // BASE_API = 'http://192.168.8.110:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康