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:
fan 2020-07-20 17:19:21 +08:00
commit 88253207d8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/newMap/newMapdraft/mapoperate/config/list.vue
View File

@ -411,9 +411,7 @@ export default {
} }
.form_data{ .form_data{
padding: 10px; padding: 6px 10px 10px 10px;
padding-top: 6px;
padding-bottom: 10px;
} }
.card{ .card{

4
src/views/newMap/newMapdraft/mapoperate/outFrameControl.vue
View File

@ -26,6 +26,7 @@
import ConstConfig from '@/scripts/ConstConfig'; import ConstConfig from '@/scripts/ConstConfig';
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import ConfigList from './config/list';
import { getUID } from '@/jmapNew/utils/Uid'; import { getUID } from '@/jmapNew/utils/Uid';
import OperateProperty from './components/operateProperty'; import OperateProperty from './components/operateProperty';
import { deepAssign } from '@/utils/index'; import { deepAssign } from '@/utils/index';
@ -33,7 +34,8 @@ import { deepAssign } from '@/utils/index';
export default { export default {
name: 'StationStandDraft', name: 'StationStandDraft',
components: { components: {
OperateProperty OperateProperty,
ConfigList
}, },
props: { props: {
selected: { selected: {