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:
Nicola Carminati
2018-04-24 12:27:31 +02:00
parent b38ae8d7b2 22f9938da0
commit f53fe9d49d
11 changed files with 83 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/assets/styles/base/card.less
+1
View File
@@ -105,6 +105,7 @@
display: flex;
flex-flow: row;
align-self: center;
margin: auto;
justify-items: center;
font-size: 18px;
line-height: 1.11;
Step/wwwroot/assets/styles/base/tooling-equipment.less
+3 -5
View File
@@ -66,6 +66,8 @@
input {
width:288px;
height: 48px;
padding: 0;
box-sizing: border-box;
}
button{
width: 48px;
@@ -77,13 +79,9 @@
.list-vertical{
width: 95%;
height: calc(~'100% - 198px');
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
display: block;
margin-top: 16px;
margin-bottom: 16px;
overflow-y: auto;
}
.footer{
height: calc(~'100% - 646px');
Step/wwwroot/assets/styles/style.css
+4 -5
View File
@@ -2694,6 +2694,7 @@ footer .container button.big:before {
display: flex;
flex-flow: row;
align-self: center;
margin: auto;
justify-items: center;
font-size: 18px;
line-height: 1.11;
@@ -3357,6 +3358,8 @@ footer .container button.big:before {
.tooling-equipment-container .tooling-equipment-box .body .list-left .search .group-btn input {
width: 288px;
height: 48px;
padding: 0;
box-sizing: border-box;
}
.tooling-equipment-container .tooling-equipment-box .body .list-left .search .group-btn button {
width: 48px;
@@ -3366,13 +3369,9 @@ footer .container button.big:before {
.tooling-equipment-container .tooling-equipment-box .body .list-left .list-vertical {
width: 95%;
height: calc(100% - 198px);
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
display: block;
margin-top: 16px;
margin-bottom: 16px;
overflow-y: auto;
}
.tooling-equipment-container .tooling-equipment-box .body .list-left .footer {
height: calc(100% - 646px);
Step/wwwroot/src/@types/tooling.d.ts
Vendored
+21
View File
@@ -9,4 +9,25 @@ declare module server{
id: number,
type: number
}
export interface Tool{
id: number,
familyName:number,
childId: number,
magazinePositionType: number,
toolType: number,
leftSize: number,
rightSize: number,
rotation:number,
cooling1: boolean,
cooling2: boolean,
isActive: boolean,
fixedPlace: boolean,
isInhibited: boolean,
isMeasured: boolean,
changeTool: boolean,
isInUse: boolean,
preAlarm: boolean,
edgesData: object
}
}
Step/wwwroot/src/components/tooling-equipment.ts
+17
View File
@@ -0,0 +1,17 @@
import Vue from "vue";
import Component from "vue-class-component";
import { equipment, inputBox } from "src/modules/base-components/cards";
import { ToolingService } from "../services/toolingService";
import { AppModel } from "src/store";
@Component({ components: { equipment, inputBox } })
export default class toolingEquipment extends Vue {
public get tools(): server.Tool[] { return (this.$store.state as AppModel).tooling.tools; }
mounted() {
new ToolingService().GetTools();
}
}
Step/wwwroot/src/components/tooling-equipment.vue
+5 -47
View File
@@ -17,30 +17,21 @@
</div>
</div>
<div class="list-vertical scrollable">
<equipment></equipment>
<equipment></equipment>
<equipment></equipment>
<equipment></equipment>
<equipment></equipment>
<equipment></equipment>
<equipment></equipment>
<equipment></equipment>
<equipment></equipment>
<equipment></equipment>
<equipment v-for="t in tools" :key="t.id" :code="t.id"></equipment>
</div>
<div class="footer">
<div class="group-label-button">{{'tooling_equipment_label_add' | localize("Aggiungi utensile")}}<button class="btn"><i class="fa fa-plus"></i></button></div>
</div>
</div>
<!-- Siemens -->
<div class="box-right" v-if="isSiemens() || isDemo()">
<div class="box-right" v-if="false">
<button class="btn"><i class="fa fa-trash"></i></button>
<div class="box-right-label-header">Modifica di E13 utensile XYZ</div>
<div class="list-skill-equipment scrollable">
<div class="list-skill-equipment-category">
<div class="skill-equipment-category">{{'tooling_equipment_list_category_general' | localize("Generali")}}</div>
<input-box title="Id" type="numeric" v-model="id" :read-only="true"></input-box>
<input-box title="Tipo Utensile" v-model="selectedItem" type="select">
<option :value="3">tre</option>
</input-box>
@@ -93,7 +84,7 @@
</div>
</div>
<!-- Osai - Fanuc -->
<div class="box-right" v-if="isFanuc() || isOsai()">
<div class="box-right" v-if="false">
<button class="btn"><i class="fa fa-trash"></i></button>
<div class="box-right-label-header">Modifica di E13 utensile XYZ</div>
<div class="list-skill-equipment scrollable">
@@ -159,37 +150,4 @@
</div>
</div>
</template>
<script>
import equipment from "src/modules/base-components/cards/equipment.vue";
import inputBox from "src/modules/base-components/cards/input-box.vue";
export default {
components:{equipment, inputBox},
data (){
return {
id: 1,
idChild: 1,
nManineDx: 1,
nManineSx: 2,
idTagliente: 1,
lifeRes: 1,
lifeNom: 1,
lifePreAllarm: 1,
selectedItem: null,
options: [{id:'456'}],
utAttivato: true,
utInibito: true,
utMisurato: true,
utInPreali: true,
utInCu: true,
utPostoFisso: true,
utInUso: true,
rotazione: true,
raffreddUno: true,
raffreddDue: true,
idIsFanucOsai: 1,
idFamily: 2,
name: 'Utensile XYZ'
}
}
}
</script>
<script src="./tooling-equipment.ts" lang="ts"></script>
Step/wwwroot/src/components/tooling.ts
+4
View File
@@ -27,4 +27,8 @@ export default class Tooling extends Vue {
public goToDepot = function (item:server.MagazineModel) {
this.$router.push({ name: 'depot', params:{id: item.id} });
}
public goTo = function (path:string) {
this.$router.push({ path: path});
}
}
Step/wwwroot/src/components/tooling.vue
+1 -1
View File
@@ -11,12 +11,12 @@
</div>
<div class="list-bottom scrollable">
<card :title="'launch_tools' | localize('Utensili')" @click="goTo('/tooling-equipment')"></card>
<!-- <card title="magazzino 1" @click="archiveClick()"></card>
<card title="magazzino 1" @click="archiveClick()"></card>
<card title="magazzino 1" @click="archiveClick()"></card>
<card title="magazzino 1" @click="archiveClick()"></card>
<card title="magazzino 1" @click="archiveClick()"></card>
<card title="magazzino 1" @click="archiveClick()"></card>
<card title="magazzino 1" @click="archiveClick()"></card> -->
</div>
</div>
Step/wwwroot/src/modules/base-components/cards/index.js
+3 -1
View File
@@ -1,5 +1,7 @@
import cardUtilities from "./card-utilities.vue";
import tool from "./tool.vue";
import detailCard from "./detail-card.vue";
import equipment from "./equipment.vue";
import inputBox from "./input-box.vue";
export { cardUtilities, tool, detailCard };
export { cardUtilities, tool, detailCard, equipment, inputBox };
Step/wwwroot/src/services/toolingService.ts
+5
View File
@@ -9,4 +9,9 @@ export class ToolingService extends baseRestService {
let result = await this.Get<server.ToolTableInfoModel>("api/tool_table/configuration");
toolingActions.updateMagazine(store, result.magazines)
}
async GetTools(){
let result = await this.Get<server.Tool[]>("api/tool_table/tools");
toolingActions.updateTools(store, result);
}
}
Step/wwwroot/src/store/tooling.store.ts
+19
View File
@@ -3,28 +3,47 @@
export interface ToolingStoreModel {
magazines: Array<server.MagazineModel>
fieldsConfiguration: Array<Object>
tools: Array<server.Tool>
}
export interface ToolingActions {
updateMagazine(context, model: server.MagazineModel[]);
updateTool(context, model: server.Tool);
updateTools(context, model: server.Tool[]);
}
export const toolingStore = {
state: {
magazines: [],
fieldsConfiguration: [],
_tools: new Map<number, server.Tool>(),
tools: []
} as ToolingStoreModel,
mutations: {
UpdateMagazine(store, model: server.MagazineModel[]) {
for (const key in model) {
store.magazines.push(model[key]);
}
},
UpdateTool(store, model: server.Tool) {
store._tools.set(model.id, model);
store.tools = Array.from(store._tools.values());
}
},
actions: {
updateMagazine(context, model: server.MagazineModel[]) {
context.commit("UpdateMagazine", model);
},
updateTool(context, model: server.Tool) {
context.commit("UpdateTool", model);
},
updateTools(context, model: server.Tool[]) {
for (const key in model) {
const element = model[key];
context.commit("UpdateTool", element);
}
}
} as ToolingActions
}