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

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

Browse Source
This commit is contained in:
Lucio Maranta
2019-03-01 13:00:47 +01:00
parent f5e26fac77 e5494df177
commit 28b6932ee2
10 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/assets/styles/base/card.less
+2 -2
View File
@@ -731,13 +731,13 @@
}
}
.number{
width: 130px;
width: 135px;
height: 32px;
border-radius: 2px;
display: flex;
justify-content: flex-end;
align-items: center;
margin-right: 13px;
margin-right: 8px;
color: @color-greyish-brown;
padding-right: 8px;
font-size: 20px;
Step/wwwroot/assets/styles/base/depot.less
+4
View File
@@ -82,6 +82,10 @@
align-items: center;
justify-content: center;
font-size: 3em;
img{
max-width: 262px;
max-height: 106px;
}
}
.busyPosHalf{
width: 136px;
Step/wwwroot/assets/styles/base/head.less
+1 -2
View File
@@ -107,7 +107,7 @@
overflow: hidden;
.tool-name{
white-space: pre;
line-height: 47px;
line-height: 41px;
}
.tool-duplo{
font-size: 14px;
@@ -335,7 +335,6 @@
overflow: hidden;
.tool-name{
white-space: pre;
line-height: 47px;
line-height: 20px;
}
.tool-duplo{
Step/wwwroot/assets/styles/style.css
+7 -4
View File
@@ -5931,7 +5931,7 @@ footer .container button.big:before {
.head-production .tool-box .tool-name,
.head-awj .tool-box .tool-name {
white-space: pre;
line-height: 47px;
line-height: 41px;
}
.head-spindle .tool-box .tool-duplo,
.head-production .tool-box .tool-duplo,
@@ -6236,7 +6236,6 @@ footer .container button.big:before {
}
.head-std aside .tool-box .tool-name {
white-space: pre;
line-height: 47px;
line-height: 20px;
}
.head-std aside .tool-box .tool-duplo {
@@ -7180,13 +7179,13 @@ footer .container button.big:before {
}
.card-axes-production .first-box-axes .axes .number,
.card-axes-production .second-box-axes .axes .number {
width: 130px;
width: 135px;
height: 32px;
border-radius: 2px;
display: flex;
justify-content: flex-end;
align-items: center;
margin-right: 13px;
margin-right: 8px;
color: #4b4b4b;
padding-right: 8px;
font-size: 20px;
@@ -11638,6 +11637,10 @@ footer .container button.big:before {
justify-content: center;
font-size: 3em;
}
.depot-container .depot-position .busyContainer .busyPos img {
max-width: 262px;
max-height: 106px;
}
.depot-container .depot-position .busyContainer .busyPosHalf {
width: 136px;
height: 136px;
Step/wwwroot/src/app_modules/production/components/head-production.vue
+1 -1
View File
@@ -47,7 +47,7 @@
<div class="tool-box" v-if="type == 'SPINDLE'" >
<label>{{'head_label_tool' | localize("Tool")}}</label>
<span v-if="!isSiemens() || (isSiemens() && !toolMounted())">{{tool}}</span>
<span class="tool-name" v-if="isSiemens()" :title="toolName">{{toolName}}</span>
<span class="tool-name" v-if="isSiemens() && toolMounted()" :title="toolName">{{toolName}}</span>
<span class="tool-duplo" v-if="isSiemens() && toolMounted()" :title="toolName">{{'tooling_tool_abbreviation' | localize('DP%d',toolDuplo)}}</span>
</div>
<div class="tool-box" v-if="type == 'WJ' ">
Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts
+1 -1
View File
@@ -598,7 +598,7 @@ export default class depot extends Vue {
// SIEMENS
public doAddToDepotPosition(position, event) {
if (this.draggingTool && this.draggingPosition == position.positionId) {
if (this.toolAtPosition(position.positionId) || !position.canLoadTool)
if (this.toolAtPosition(position.positionId) || !position.canLoadTool || position.occupied)
return
this.draggingIn = false;
Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue
+2 -2
View File
@@ -55,7 +55,7 @@
<div class="loading" v-if="onLoading"><i class="fa fa-circle-o-notch fa-spin"></i></div>
<div class="sd-section scrollable" ref="positionslist">
<detail-card v-for="(pos, idx) in positions" :key="pos.positionId" :physicalType="pos.physicalType" :label="'tooling_magpos_abbreviation' | localize('P%d',pos.positionId)" :number="pos.positionId" class="depot-position" @click="openModalLoadDepot(pos.positionId,pos.type)" :class="{'drop':draggingIn,'selected': currentPosition == idx}" :magpos-occupied="toolAtPosition(pos.positionId)" :editable="editable" :disabled="pos.disabled">
<detail-card v-for="(pos, idx) in positions" :key="pos.positionId" :physicalType="pos.physicalType" :label="'tooling_magpos_abbreviation' | localize('P%d',pos.positionId)" :number="pos.positionId" class="depot-position" @click="openModalLoadDepot(pos.positionId,pos.type)" :class="{'drop':draggingIn,'selected': currentPosition == idx}" :magpos-occupied="toolAtPosition(pos.positionId) || pos.occupied" :editable="editable" :disabled="pos.disabled">
<Container class="target" group-name="tools" orientation="horizontal"
:shoud-animate-drop="disableDropAnimation"
@drag-enter="onDragEnter(pos.positionId)" @drag-leave="onDragLeave()"
@@ -71,7 +71,7 @@
@click="removeToolsToDepot(pos.positionId, toolAtPosition(pos.positionId))"
@clickinfo="toolAtPosition(pos.positionId).childShank ? openInfoShank(toolAtPosition(pos.positionId).toolId) : openInfoEquipment(toolAtPosition(pos.positionId).toolId)">
</card-tool-depot>
<card-busy-depot v-if="!toolAtPosition(pos.positionId)" :type=pos.busyStatus></card-busy-depot>
<card-busy-depot v-if="!toolAtPosition(pos.positionId)" :type="pos.busyStatus" :toolInSpindle="pos.occupied"></card-busy-depot>
</detail-card>
</div>
<div ref="squarecontainer" class="square-container-fixed">
Step/wwwroot/src/modules/base-components/cards/card-busy-depot.vue
+5 -1
View File
@@ -21,12 +21,16 @@
<div class="busyPos" v-if="type==0">
<i class="fa fa-arrows-h"></i>
</div>
<div class="busyPos" v-if="type==4 && toolInSpindle">
<img src="assets/icons/MagPos/Spindle.png" />
</div>
</span>
</template>
<script>
export default {
props:{
type: {default:4}
type: {default:4},
toolInSpindle: {default:false}
},
methods:{
}
Step/wwwroot/src/modules/heads/head-SPINDLE.vue
+1 -1
View File
@@ -28,7 +28,7 @@
<div class="tool-box">
<label>{{'head_label_tool' | localize("Tool")}}</label>
<span v-if="!isSiemens() || (isSiemens() && !toolMounted())">{{tool}}</span>
<span class="tool-name" v-if="isSiemens()" :title="toolName">{{toolName}}</span>
<span class="tool-name" v-if="isSiemens() && toolMounted()" :title="toolName">{{toolName}}</span>
<span class="tool-duplo" v-if="isSiemens() && toolMounted()" :title="toolName">{{'tooling_tool_abbreviation' | localize('DP%d',toolDuplo)}}</span>
</div>
Step/wwwroot/src/modules/heads/head.vue
+1 -1
View File
@@ -34,7 +34,7 @@
<div class="tool-box" :title="'heads_tooltip_tool' | localize('Mounted-Tool Info')">
<label>{{'head_label_tool' | localize("Tool")}}</label>
<span v-if="!isSiemens() || (isSiemens() && !toolMounted())">{{tool}}</span>
<span class="tool-name" v-if="isSiemens()" :title="toolName">{{toolName}}</span>
<span class="tool-name" v-if="isSiemens() && toolMounted()" :title="toolName">{{toolName}}</span>
<span class="tool-duplo" v-if="isSiemens() && toolMounted()" :title="toolName">{{'tooling_tool_abbreviation' | localize('DP%d',toolDuplo)}}</span>
</div>
<div class="load-box" :class="loadStatus()" :disabled="loadDisabled" :title="'heads_tooltip_load' | localize('Actual Load')">