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

Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

Browse Source
This commit is contained in:
ival 2019-08-21 11:29:13 +08:00
commit 09af43a690
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/scriptManage/display/index.vue
View File

@ -24,7 +24,7 @@ export default {
data() { data() {
return { return {
size: { size: {
width: document.documentElement.clientWidth - 970, width: document.documentElement.clientWidth - 780,
height: document.documentElement.clientHeight height: document.documentElement.clientHeight
}, },
group:this.$route.query.group, group:this.$route.query.group,
@ -36,7 +36,7 @@ export default {
}, },
methods: { methods: {
resizeHandler() { resizeHandler() {
this.size = { width: this._clientWidth - 970, height: this._clientHeight}; this.size = { width: this._clientWidth - 780, height: this._clientHeight};
}, },
loadInitData() { loadInitData() {
} }
@ -49,7 +49,7 @@ export default {
display: flex; display: flex;
flex-flow: row; flex-flow: row;
.script-card { .script-card {
width: 970px; width: 780px;
} }
} }
</style> </style>

2
src/views/scriptManage/display/tipScriptRecord.vue
View File

@ -190,7 +190,7 @@ import {saveScriptScenes, saveScriptData, dumpScriptData, updateMapLocation, scr
float: left; float: left;
left: 0px; left: 0px;
top:0px; top:0px;
width: 955px; width: 765px;
height:100%; height:100%;
background-color: #fff; background-color: #fff;
overflow: hidden; overflow: hidden;

4
src/views/scriptManage/scriptRecord/addAction.vue
View File

@ -373,11 +373,11 @@
// width:98%; // width:98%;
} }
.inputStyle{ .inputStyle{
width:300px; width:200px;
height:30px; height:30px;
} }
.textareaStyle{ .textareaStyle{
width:300px; width:200px;
} }
.conversitionCard{ .conversitionCard{
margin-left: 20px; margin-left: 20px;

14
src/views/scriptManage/scriptRecord/getAction.vue
View File

@ -169,14 +169,14 @@
} }
.addScript{ .addScript{
float:left; float:left;
width:450px; width:380px;
display: inline-block; display: inline-block;
} }
.actionListTable{ .actionListTable{
font-size: 15px; font-size: 15px;
width:490px; width:380px;
display: inline-block; display: inline-block;
margin-left:450px; margin-left:380px;
height:100%; height:100%;
} }
.actionList{ .actionList{
@ -188,7 +188,7 @@
top: 0; top: 0;
left: 0; left: 0;
margin-right: 20px; margin-right: 20px;
width: 940px; width: 740px;
border-bottom: 1px #ccc solid; border-bottom: 1px #ccc solid;
} }
.titleStyle{ .titleStyle{
@ -200,7 +200,7 @@
position: relative; position: relative;
} }
.actionTable{ .actionTable{
width:370px; width:280px;
padding: 15px 0px 10px 15px; padding: 15px 0px 10px 15px;
display: inline-block; display: inline-block;
line-height: 200%; line-height: 200%;
@ -219,11 +219,11 @@
width: 0px; width: 0px;
} }
.el_timeline{ .el_timeline{
width: 470px; width: 360px;
margin-top:10px; margin-top:10px;
} }
.elScrollbar{ .elScrollbar{
width: 450px; width: 380px;
position: absolute; position: absolute;
} }
</style> </style>