Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix layout axes

Browse Source
This commit is contained in:
Alessandro Francia
2018-07-18 16:59:07 +02:00
parent 1ff5629abf
commit b950d2f99b
7 changed files with 20 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/assets/styles/base/card.less
+8 -7
View File
@@ -699,7 +699,7 @@
width: 100%;
height: 294px;
.tabs{
height: 30px;
min-height: 30px;
width:100%;
background-color: @color-whitethree;
display: flex;
@@ -720,13 +720,14 @@
.tab:last-child{
border: none;
}
.content-box{
height: calc(~'100% - 30px');
background-color: red;
width: 100%;
display: flex;
}
}
.content-box{
height: calc(~'100% - 30px');
width: 100%;
display: flex;
flex-flow: column;
overflow: auto;
}
}
}
Step/wwwroot/assets/styles/style.css
+4 -3
View File
@@ -4461,7 +4461,7 @@ footer .container button.big:before {
height: 294px;
}
.card-axes-production .second-box-axes .tabs {
height: 30px;
min-height: 30px;
width: 100%;
background-color: #e7e7e7;
display: flex;
@@ -4483,11 +4483,12 @@ footer .container button.big:before {
.card-axes-production .second-box-axes .tabs .tab:last-child {
border: none;
}
.card-axes-production .second-box-axes .tabs .content-box {
.card-axes-production .second-box-axes .content-box {
height: calc(100% - 30px);
background-color: red;
width: 100%;
display: flex;
flex-flow: column;
overflow: auto;
}
.card-folder-path {
width: auto;
Step/wwwroot/src/components/production.vue
+2 -7
View File
@@ -8,8 +8,8 @@
<div class="box-left">
<div class="box-left-video">
<div class="box-header">
<button class="btn" :class="{'pressed': activeCms}" @click="clickCms()">CMS</button>
<button class="btn" :class="{'pressed': activeCnc}" @click="clickCnc()">CNC</button>
<button class="btn" :class="{'pressed': activeCms}" @click="clickCms()">{{'production_box_video_button_cms' | localize("CMS")}}</button>
<button class="btn" :class="{'pressed': activeCnc}" @click="clickCnc()">{{'production_box_video_button_cms' | localize("CNC")}}</button>
</div>
<div class="cnc" v-if="activeCnc">
<img id="cnc-img" src="assets/images/Siemens_Placeholder.jpg" @click="closeAlarmsRibbon()" v-if="isSiemens()">
@@ -36,11 +36,6 @@
<button v-if="machineInfo.isSiemens" @click="ncClick(18)" :disabled="!isKeyActive(18)" :class="{active:isKeySelected(18) , inverted:isReadOnly(18)}" class="soft ">{{name(18)}}</button>
<button v-if="machineInfo.isSiemens" @click="ncClick(19)" :disabled="!isKeyActive(19)" :class="{active:isKeySelected(19) , inverted:isReadOnly(19)}" class="soft ">{{name(19)}}</button>
<button v-if="machineInfo.isSiemens || isDemo()" @click="ncClick(20)" :disabled="!isKeyActive(20)" :class="{active:isKeySelected(20) , inverted:isReadOnly(20)}" class="soft "><img class="teach" src="../../assets/icons/under-hood-png/teach.png" />{{name(20)}}</button>
<!-- <button class="soft icon"><img src="../../assets/icons/_png/blk-active.png" />Blk/Blk</button>
<button class="soft icon"><img src="../../assets/icons/_png/blk-del-active.png" />BlkDel</button>
<button class="soft icon"><img src="../../assets/icons/_png/m-lock-active.png" />MLock</button>
<button class="soft icon"><img src="../../assets/icons/_png/dry-run-active.png" />DryRun</button>
<button class="soft icon">OpStop</button> -->
</div>
</div>
</div>
Step/wwwroot/src/modules/base-components/cards/card-axes-production.vue
+6 -7
View File
@@ -13,11 +13,11 @@
</div>
<div class="second-box-axes">
<div class="tabs">
<button class="tab" :class="{'active': enableOm}" @click="selectTab('OM')">OM</button>
<button class="tab" :class="{'active': enableGoto}" @click="selectTab('GOTO')">GOTO</button>
<button class="tab" :class="{'active': enableProg}" @click="selectTab('ERR')">PROG</button>
<button class="tab" :class="{'active': enableOm}" @click="selectTab('OM')">{{'card_axes_production_axes_tab_om' | localize("OM")}}</button>
<button class="tab" :class="{'active': enableGoto}" @click="selectTab('GOTO')">{{'card_axes_production_axes_tab_goto' | localize("GOTO")}}</button>
<button class="tab" :class="{'active': enableProg}" @click="selectTab('ERR')">{{'card_axes_production_axes_tab_prog' | localize("PROG")}}</button>
</div>
<div class="content-box" v-if="enableOm">
<div class="content-box scrollable" v-if="enableOm">
<div class="axes" v-for="a in axes(nameAxes,axesMachine)" :key="a.id">
<div class="variable">
{{a.name}}
@@ -27,7 +27,7 @@
</div>
</div>
</div>
<div class="content-box" v-if="enableGoto">
<div class="content-box scrollable" v-if="enableGoto">
<div class="axes" v-for="a in axes(nameAxes,axesToGo)" :key="a.id">
<div class="variable">
{{a.name}}
@@ -37,7 +37,7 @@
</div>
</div>
</div>
<div class="content-box" v-if="enableProg">
<div class="content-box scrollable" v-if="enableProg">
<div class="axes" v-for="a in axes(nameAxes,axesProgrammePos)" :key="a.id">
<div class="variable">
{{a.name}}
@@ -111,7 +111,6 @@ export default {
}
},
axes: function(name,value) {
debugger
var nameAxes;
var valueAxes;
var newAxis = [];
Step/wwwroot/src/modules/base-components/cards/softkeys-prefered.vue
-15
View File
@@ -9,13 +9,6 @@
{{title}}
</div>
<div class="control">
<!-- <input v-if="type=='string'" v-model="bindingValue" :readonly="readOnly" v-validate.initial="'required'">
<select class="arrow" v-model="bindingValue" v-if="type=='select'" :disabled="readOnly">
<slot></slot>
</select>
<input v-if="type=='int' || type=='double'" v-model.number="bindingValue" type="number"
:min="minValue" :max="maxValue" v-validate.initial="{min_value:minValue, max_value: maxValue}"
:readonly="readOnly"> -->
<div class="button" v-if="type==1" @click="onClick()">
<i class="fa fa-arrow-right"></i>
</div>
@@ -27,10 +20,6 @@
</div>
<div class="multiple" v-if="type==2">
<span v-for="k in keys" :key="k" :class="{active:getSoftKeyStatus(k), disabled:!disabledNoMultiple && !getSoftKeyActive(k)}">{{getSubKeyText(k)}}</span>
<!-- <span v-for="k in keys"
:disabled="!getSoftKeyActive(k)"
:class="{active:getSoftKeyStatus(k)}"
:key="k" @click="sendSubKey(k)">{{getSubKeyText(k)}}</span> -->
</div>
<div class="menu-container" v-if="menuOpened" :class="{bottom: verticalIndex<=0, top: verticalIndex>0}"> <!-- left : subkeyslength>3 && positionIndex%4 == 0, right: subkeyslength>3 && positionIndex%4 == 3 -->
<div class="menu">
@@ -38,10 +27,6 @@
:disabled="!getSoftKeyActive(k)"
:class="{active:getSoftKeyStatus(k)}"
:key="k" @click="sendSubKey(k)">{{getSubKeyText(k)}}</button>
<!-- <button>1</button>
<button>2</button>
<button>3</button>
<button>4</button> -->
</div>
</div>
</div>
Step/wwwroot/src/modules/plc-softkeys.vue
-17
View File
@@ -73,23 +73,6 @@
<button v-if="enableSelected" class="btn" @click="addItemsToFavorites()">Termina selezione</button>
</div>
</div>
<!-- <group-soft-key v-if="selectedSoftKey!=null"
:title="'softkey_' + selectedSoftKey.id | localize('softkey_' + selectedSoftKey.id)"
style="position:absolute"
:selected="false"
:subkeys="selectedSoftKey.subKeys"
:subkeysStatus="getSubKeysStatus(selectedSoftKey.subKeys)"
:activeSubKeys="getSubKeysActive(selectedSoftKey.subKeys)"
@click="toggleMenu(selectedSoftKey)"
:style="{ top: selectedPositionTop , left: selectedPositionLeft}"
:menu-opened="selectedSoftKey.id == selectedMenuItem"
:class="{opened: selectedSoftKey.id == selectedMenuItem}"
:confirmationNeeded="selectedSoftKey.operatorConfirmationNeeded"
@subkeyClick="softKeyChanged"></group-soft-key> -->
<!-- <div class="softkeys-backdrop-top" v-if="selectedMenuItem"></div>
<div class="softkeys-backdrop-left" v-if="selectedMenuItem"></div>
<div class="softkeys-backdrop-right" v-if="selectedMenuItem"></div>
<div class="softkeys-backdrop-bottom" v-if="selectedMenuItem"></div> -->
</div>
<div class="waiting-button" :class="{waiting : waitingForStart}" >
Step/wwwroot/src/services/hub.ts
-2
View File
@@ -110,9 +110,7 @@ export class Hub {
}
private static axesPositionsDataChanged(data) {
debugger
processModelActions.setValueAxisSelected(store, data);
console.log(data);
}
private static magazineStatusChanged(data){