Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop
This commit is contained in:
Lucio Maranta
@@ -39,6 +39,10 @@ export default class depot extends Vue {
|
||||
return this.availableTools.filter(t => t.familyName.toLowerCase().indexOf(this.currentFilter) >= 0);
|
||||
}
|
||||
|
||||
public get getNcAvaiableTools() {
|
||||
return this.ncAvailableTools.filter(t => String(t.familyId).toLowerCase().indexOf(this.currentFilter) >= 0);
|
||||
}
|
||||
|
||||
public getPayloadForAvaiableTools(index: number): any {
|
||||
if (index < this.getAvaiableMultiTools.length)
|
||||
return this.getAvaiableMultiTools[index];
|
||||
@@ -96,6 +100,7 @@ export default class depot extends Vue {
|
||||
// return (this.$store.state as AppModel).tooling.magazinesPositions.filter(p => p.magazineId == this.depotId); }
|
||||
public get availableMultiTools(): server.MultiTools[] { return (this.$store.state as AppModel).depot.availableMultiTool; }
|
||||
public get availableTools(): server.Tools[] { return (this.$store.state as AppModel).depot.availableTool; }
|
||||
public get ncAvailableTools(): server.ToolNc[] { return (this.$store.state as AppModel).depot.ncAvailableTool; }
|
||||
|
||||
public magazines: server.MagazineModel[] = (this.$store.state as AppModel).tooling.magazines;
|
||||
public enableModify: any = false;
|
||||
@@ -113,7 +118,7 @@ export default class depot extends Vue {
|
||||
public draggingTool: any = null;
|
||||
public draggingPosition: number = null;
|
||||
|
||||
public typeNc: string = "Demo";
|
||||
public typeNc: string = "Osai";
|
||||
|
||||
@Watch("searchText")
|
||||
public applyFilter(n) {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<button class="btn" v-if="false" @click="StartToolingWizard()" >{{'depot_button_assistedtooling' | localize("Attrezzaggio automatico")}}</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="depot-boxbody">
|
||||
<div class="depot-boxbody" v-if="typeNc == 'Demo'">
|
||||
<div class="list-left" v-if="editable">
|
||||
<span class="depot-search-label">{{'depot_label_search' | localize("Seleziona un utensile e trascinalo nel magazzino corrispondente:")}}</span>
|
||||
<div class="depot-search">
|
||||
@@ -114,6 +114,110 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="depot-boxbody" v-if="typeNc == 'Osai'">
|
||||
<div class="list-left" v-if="editable">
|
||||
<span class="depot-search-label">{{'depot_label_search' | localize("Seleziona un utensile e trascinalo nel magazzino corrispondente:")}}</span>
|
||||
<div class="depot-search">
|
||||
<input type="text" v-model="searchText" :placeholder="'depot_search_placeholder' | localize('Cerca un utensile per nome')" />
|
||||
<i class="fa fa-2x fa-search"></i>
|
||||
</div>
|
||||
<div class="list-vertical scrollable">
|
||||
<Container @drag-start="onDrag" @drag-end="onDragEnd" :shoud-animate-drop="disableDropAnimation" :get-child-payload="getPayloadForAvaiableTools" group-name="tools">
|
||||
<Draggable v-for="m in getAvaiableMultiTools" :key="m.id" >
|
||||
<div>
|
||||
<tool :code="'tooling_shank_abbreviation' | localize('S%d',m.id)" :title="m.name" img-source="../assets/icons/Tools/Shanks.png" @click="openInfoShank(m.id)"></tool>
|
||||
</div>
|
||||
</Draggable>
|
||||
<Draggable v-for="t in getNcAvaiableTools" :key="t.id">
|
||||
<div >
|
||||
<tool :code="'tooling_tool_abbreviation' | localize('T%d',t.id)" :title="t.familyId" :img-source="getInfoEquipmentIcon(t.toolType)" @click="openInfoEquipment(t.id)"></tool>
|
||||
</div>
|
||||
</Draggable>
|
||||
</Container>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="box-right">
|
||||
<div class="single-depot">
|
||||
<div class="sd-header">
|
||||
<button class="btn" v-if="m.id == depotId && magazines[key-1]" v-for="(m,key) in magazines" :key="'mag_p'+m.id" :disabled="disableFastButton()" @click="changeMagazine(magazines[key-1].id)"><i class="fa fa-chevron-left"></i></button>
|
||||
<span>{{updateMagStatusAndgetStoreTitle(depotId)}}</span>
|
||||
<button class="btn" v-if="m.id == depotId && magazines[key+1]" v-for="(m,key) in magazines" :key="'mag_s'+m.id" :disabled="disableFastButton()" @click="changeMagazine(magazines[key+1].id)"><i class="fa fa-chevron-right"></i></button>
|
||||
</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, 'disabled':pos.disabled}" :magpos-occupied="toolAtPosition(pos.positionId)" :editable="editable">
|
||||
<Container class="target" group-name="tools"
|
||||
:shoud-animate-drop="disableDropAnimation"
|
||||
@drag-enter="onDragEnter(pos.positionId)" @drag-leave="onDragLeave()"
|
||||
@drop="addToDepotPosition(pos, $event)">
|
||||
<span class="empty" v-if="!toolAtPosition(pos.positionId) && !pos.disabled && checkMagPosType(pos.type) && draggingIn">{{'depot_avaiable_position' | localize("Posizione disponibile")}}</span>
|
||||
</Container>
|
||||
<card-tool-depot :class="{'stateProblemsTool': enableStateProblemTool && toolIsInError(returnChild(toolAtPosition(pos.positionId)))}" v-if="toolAtPosition(pos.positionId)"
|
||||
:code="returnChild(toolAtPosition(pos.positionId)).namedId"
|
||||
:title="returnChild(toolAtPosition(pos.positionId)).name"
|
||||
:imgSource="getInfoEquipmentIconFromTool(returnChild(toolAtPosition(pos.positionId)))"
|
||||
:editable="editable"
|
||||
@click="removeToolsToDepot(pos.positionId, ...arguments)"
|
||||
@clickinfo="toolAtPosition(pos.positionId).childShank ? openInfoShank(toolAtPosition(pos.positionId).toolId) : openInfoEquipment(toolAtPosition(pos.positionId).toolId)">
|
||||
</card-tool-depot>
|
||||
</detail-card>
|
||||
</div>
|
||||
<div ref="squarecontainer" class="square-container-fixed">
|
||||
<div class="square-container single" v-if="magazineType==0">
|
||||
<div class="linesquare">
|
||||
<div class="square empty"
|
||||
v-for="(pos) in positions" :key="pos.positionId"
|
||||
@click="goToPosition(pos.positionId-1)"
|
||||
@dragover=" (!toolAtPosition(pos.positionId) && !pos.disabled && checkMagPosType(pos.type) && draggingIn)? goToPosition(pos.positionId-1):{}"
|
||||
@mouseover=" (!toolAtPosition(pos.positionId) && !pos.disabled && checkMagPosType(pos.type) && draggingIn)? goToPosition(pos.positionId-1):{}"
|
||||
@touchstart.native=" test()"
|
||||
:class="{ 'full': toolAtPosition(pos.positionId),
|
||||
'red': (enableStateProblemTool && toolIsInError(returnChild(toolAtPosition(pos.positionId)))),
|
||||
'selected': !toolAtPosition(pos.positionId) && !pos.disabled && checkMagPosType(pos.type) && draggingIn,
|
||||
}">{{pos.positionId}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="square-container" v-if="magazineType==1 || magazineType==2">
|
||||
<div class="linesquare">
|
||||
<div class="square empty"
|
||||
v-for="(pos) in positions_1_2" :key="pos.positionId"
|
||||
@click="goToPosition(pos.positionId-1)"
|
||||
@dragover=" (!toolAtPosition(pos.positionId) && !pos.disabled && checkMagPosType(pos.type) && draggingIn)? goToPosition(pos.positionId-1):{}"
|
||||
@mouseover=" (!toolAtPosition(pos.positionId) && !pos.disabled && checkMagPosType(pos.type) && draggingIn)? goToPosition(pos.positionId-1):{}"
|
||||
@touchstart.native=" test()"
|
||||
:class="{ 'full': toolAtPosition(pos.positionId),
|
||||
'red': (enableStateProblemTool && toolIsInError(returnChild(toolAtPosition(pos.positionId)))),
|
||||
'selected': !toolAtPosition(pos.positionId) && !pos.disabled && checkMagPosType(pos.type) && draggingIn,
|
||||
}">{{pos.positionId}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="divider" v-if="positions.length > 0"></div>
|
||||
<div class="linesquare second">
|
||||
<div class="square empty"
|
||||
v-for="(pos) in positions_2_2" :key="pos.positionId"
|
||||
@click="goToPosition(pos.positionId-1)"
|
||||
@dragover=" (!toolAtPosition(pos.positionId) && !pos.disabled && checkMagPosType(pos.type) && draggingIn)? goToPosition(pos.positionId-1):{}"
|
||||
@mouseover=" (!toolAtPosition(pos.positionId) && !pos.disabled && checkMagPosType(pos.type) && draggingIn)? goToPosition(pos.positionId-1):{}"
|
||||
@touchstart.native=" test()"
|
||||
:class="{ 'full': toolAtPosition(pos.positionId),
|
||||
'red': (enableStateProblemTool && toolIsInError(returnChild(toolAtPosition(pos.positionId)))),
|
||||
'selected': !toolAtPosition(pos.positionId) && !pos.disabled && checkMagPosType(pos.type) && draggingIn,
|
||||
}">{{pos.positionId}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="depot-footer">
|
||||
<div class="depot-footer-left">
|
||||
<!-- <div class="depot-checkbox" >
|
||||
|
||||
Reference in New Issue
Block a user