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

disable list

Browse Source
This commit is contained in:
Alessandro Francia
2018-05-18 10:49:24 +02:00
parent a9c7d3bbe5
commit a5a71f4c43
10 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/assets/styles/base/tooling-equipment.less
+4
View File
@@ -275,3 +275,7 @@
}
}
}
.avoid-clicks {
pointer-events: none;
}
Step/wwwroot/assets/styles/style.css
+3
View File
@@ -6830,6 +6830,9 @@ footer .container button.big:before {
color: #dfdfdf;
background-image: none;
}
.avoid-clicks {
pointer-events: none;
}
.info-equipment-container {
height: 100%;
width: 100%;
Step/wwwroot/src/components/tooling-equipment.ts
+12 -2
View File
@@ -40,6 +40,7 @@ export default class toolingEquipment extends Vue {
public enableParameters: boolean = true;
public enableEquipment: boolean = false;
public enableModify: any = false;
public disableList: any = false;
async mounted() {
await new ToolingService().GetTools();
@@ -70,6 +71,7 @@ export default class toolingEquipment extends Vue {
public modify(){
this.enableModify = true;
this.disableList = true;
}
public fieldTool(){
@@ -86,6 +88,7 @@ export default class toolingEquipment extends Vue {
public addEquipment(){
this.selectedTool = {};
this.enableModify = true;
this.disableList = true;
this.fieldTool();
}
@@ -125,7 +128,7 @@ export default class toolingEquipment extends Vue {
console.log(this.selectedEquipment);
this.enableEquipment = true;
this.enableParameters = false;
this.enableModify = false;
this.enableModify = true;
}
else if(elem.id > 0){
this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration;
@@ -143,8 +146,9 @@ export default class toolingEquipment extends Vue {
}
}
public cancel = function (path: string) {
public cancel = function () {
this.selectedTool = null;
this.disableList = false;
}
public getToolIcon = function (id) {
@@ -159,6 +163,8 @@ export default class toolingEquipment extends Vue {
private internalCounter = -1;
public addEdge(){
debugger
this.disableList = true;
this.enableModify = true;
var obj = { edgeAdditionalParams:{}};
this.fieldEdge(obj);
obj["id"] = -1;
@@ -175,6 +181,7 @@ export default class toolingEquipment extends Vue {
this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration;
this.edgeConfiguration = (this.$store.state as AppModel).tooling.edgesConfiguration;
this.disableList = false;
});
}
@@ -182,6 +189,7 @@ export default class toolingEquipment extends Vue {
new ToolingService().UpdateSiemensTool(model).then(response => {
this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration;
this.edgeConfiguration = (this.$store.state as AppModel).tooling.edgesConfiguration;
this.disableList = false;
});
}
@@ -192,6 +200,7 @@ export default class toolingEquipment extends Vue {
this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration;
this.edgeConfiguration = (this.$store.state as AppModel).tooling.edgesConfiguration;
this.selectTab(response);
this.disableList = false;
});
}
@@ -200,6 +209,7 @@ export default class toolingEquipment extends Vue {
new ToolingService().UpdateEdgeData(tool,model).then(response => {
this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration;
this.edgeConfiguration = (this.$store.state as AppModel).tooling.edgesConfiguration;
this.disableList = false;
});
}
Step/wwwroot/src/components/tooling-equipment.vue
+6 -6
View File
@@ -19,18 +19,18 @@
<button class="btn square"><i class="fa fa-filter"></i></button>
</div>
</div>
<div class="list-vertical scrollable" ref="toolList">
<div class="list-vertical scrollable" ref="toolList" :class="{'avoid-clicks': disableList}">
<equipment v-for="t in tools" :key="t.id" :code="t.id" :title="t.familyName"
:img-source="getToolIcon(t.toolType)"
:class="{selected: selectedTool == t}"
@click="selectTool(t)"></equipment>
</div>
<div class="footer">
<div class="group-label-button">{{'tooling_equipment_label_add' | localize("Aggiungi utensile")}}<button class="btn" @click="addEquipment()"><i class="fa fa-plus"></i></button></div>
<div class="group-label-button" :class="{'avoid-clicks': disableList}">{{'tooling_equipment_label_add' | localize("Aggiungi utensile")}}<button class="btn" @click="addEquipment()"><i class="fa fa-plus"></i></button></div>
</div>
</div>
<div class="box-right" v-if="selectedTool">
<div class="tab-box-right">
<div class="tab-box-right" :class="{'avoid-clicks': disableList}">
<button class="tab" :class="{'active': enableParameters}" @click="selectTab('Parameters')">Parametri</button>
<div class="tab-box-scroll scrollable">
<button v-for="ed in selectedTool.edgesData" :key="ed.id" class="tab" v-if="ed.id != null" :class="{'active': selectedEquipment == ed}" @click="selectTab(ed)">
@@ -46,14 +46,14 @@
<button class="btn deleteElement" @click="deleteTool(selectedTool)"><i class="fa fa-trash"></i></button>
<div class="box-right-label-header">Modifica di {{selectedTool.id}} {{selectedTool.familyName}}</div>
<div class="list-skill-equipment scrollable">
<div class="list-skill-equipment-category" v-for="c in categories" :key="c">
<div class="list-skill-equipment-category" v-for="c in categories" :key="c" :class="{'avoid-clicks': !disableList}">
<div class="skill-equipment-category">{{'tooling_equipment_list_category_' + c | localize(c)}}</div>
<input-box v-for="t in toolsConfiguration" :key="t.name"
v-if="t.name != '' && t.category == c"
v-model="selectedTool[t.name]"
:read-only="t.readOnly"
:title="t.name | localize(t.name)" :type="t.type">
<option v-for="(s, k) in t.selectValues" :key="k" :selected="selectedTool[t.name]" :value="k">{{s}}</option>
<option :class="{'avoid-clicks': !disableList}" v-for="(s, k) in t.selectValues" :key="k" :selected="selectedTool[t.name]" :value="k">{{s}}</option>
</input-box>
</div>
</div>
@@ -67,7 +67,7 @@
<button class="btn deleteElement" @click="deleteEdgeData(selectedTool,selectedEquipment)"><i class="fa fa-trash"></i></button>
<div class="box-right-label-header">{{'tooling_edgesdata_skill_tools' | localize("Tagliente")}} {{(selectedEquipment.id > 0 ? selectedEquipment.id : "")}}</div>
<div class="list-skill-equipment scrollable">
<div v-for="ed in selectedTool.edgesData" :key="ed.id" v-if="selectedEquipment == ed" class="list-skill-equipment-category" >
<div v-for="ed in selectedTool.edgesData" :key="ed.id" v-if="selectedEquipment == ed" class="list-skill-equipment-category" :class="{'avoid-clicks': !disableList}">
<div v-for="ce in categoriesEdge" :key="ce" class="skill-equipment-category">
<div class="skill-equipment-category">{{'tooling_equipment_list_category_' + ce | localize(ce)}}</div>
<input-box v-for="c in edgeConfiguration" :key="c.name"
Step/wwwroot/src/components/tooling-families.ts
+8 -2
View File
@@ -25,6 +25,7 @@ export default class toolingFamilies extends Vue {
public enableParameters: boolean = true;
public enableEquipment: boolean = false;
public enableModify: any = false;
public disableList: any = false;
public selectedTool: any = null;
@@ -48,6 +49,7 @@ export default class toolingFamilies extends Vue {
}
public modify(){
this.enableModify = true;
this.disableList = true;
}
public selectTool(item) {
@@ -68,6 +70,7 @@ export default class toolingFamilies extends Vue {
this.familyConfiguration.push(element);
}
}
this.disableList = true;
}
public selectTab(elem) {
@@ -88,8 +91,9 @@ export default class toolingFamilies extends Vue {
}
}
public cancel = function (path: string) {
this.selectedTool = null
public cancel = function () {
this.selectedTool = null;
this.disableList = false;
}
async save(item) {
@@ -100,6 +104,7 @@ export default class toolingFamilies extends Vue {
htmlelement.scrollTop = htmlelement.scrollHeight;
this.familyConfiguration = (this.$store.state as AppModel).tooling.familyConfiguration;
this.disableList = false;
});
}
@@ -107,6 +112,7 @@ export default class toolingFamilies extends Vue {
new ToolingService().UpdateFamily(model).then(response => {
this.familyConfiguration = (this.$store.state as AppModel).tooling.familyConfiguration;
this.disableList = false;
});
}
Step/wwwroot/src/components/tooling-families.vue
+4 -4
View File
@@ -19,19 +19,19 @@
<button class="btn square"><i class="fa fa-filter"></i></button>
</div>
</div>
<div class="list-vertical scrollable" ref="familyList">
<div class="list-vertical scrollable" ref="familyList" :class="{'avoid-clicks': disableList}">
<equipment v-for="f in families" :key="f.uid" :title="f.name || f.oldName"
:class="{selected: selectedTool && selectedTool.uid == f.uid}"
:img-source="'../assets/images/list-families.PNG'"
@click="selectTool(f)"></equipment>
</div>
<div class="footer">
<div class="group-label-button">{{'tooling_families_label_add' | localize("Aggiungi famiglia")}}<button class="btn" @click="addFamily()"><i class="fa fa-plus"></i></button></div>
<div class="group-label-button" :class="{'avoid-clicks': disableList}">{{'tooling_families_label_add' | localize("Aggiungi famiglia")}}<button class="btn" @click="addFamily()"><i class="fa fa-plus"></i></button></div>
</div>
</div>
<!-- Siemens -->
<div class="box-right" v-if="(isSiemens() || isDemo()) && selectedTool">
<div class="tab-box-right">
<div class="tab-box-right" :class="{'avoid-clicks': disableList}">
<button class="tab" :class="{'active': enableParameters}" @click="selectTab('Parameters')">Parametri</button>
<div class="tab-box-scroll scrollable">
<button v-for="ct in selectedTool.childTools" :key="ct.id" class="tab" :class="{'active': enableEquipment == ct.id}" @click="selectTab(ct.id)">{{'tooling_childtoolsfamily_skill_tools' | localize(" Utensile")}} {{ct.id}}</button>
@@ -42,7 +42,7 @@
<div class="box-right-label-header" v-if="selectedTool.id">{{'tooling_families_boxright_header_modify' | localize("Modifica di")}} {{selectedTool.name}}</div>
<div class="box-right-label-header" v-if="!selectedTool.id">{{'tooling_families_boxright_header_add' | localize("Aggiungi")}} {{selectedTool.name}}</div>
<div class="list-skill-families scrollable">
<div class="list-skill-families-category" v-for="c in categories" :key="c">
<div class="list-skill-families-category" v-for="c in categories" :key="c" :class="{'avoid-clicks': !disableList}">
<div class="skill-families-category">{{'tooling_families_list_category_' + c | localize(c)}}</div>
<input-box v-for="f in familyConfiguration" :key="f.name"
v-if="f.name != '' && f.category == c"
Step/wwwroot/src/components/tooling-magpos.ts
+6 -2
View File
@@ -14,6 +14,7 @@ export default class toolingMagPos extends Vue {
public selectedTool: any = null;
public enableModify: any = false;
public disableList: any = false;
mounted() {
new ToolingService().GetMagazinesPositions();
@@ -29,15 +30,18 @@ export default class toolingMagPos extends Vue {
public modify(){
this.enableModify = true;
this.disableList = true;
}
public cancel = function (path: string) {
this.selectedTool = null
public cancel = function () {
this.selectedTool = null;
this.disableList = false;
}
async modifyMagPos(model) {
new ToolingService().UpdateMagPos(model).then(response => {
this.magposConfiguration = (this.$store.state as AppModel).tooling.magazinePosConfiguration;
this.disableList = false;
});
}
}
Step/wwwroot/src/components/tooling-magpos.vue
+2 -2
View File
@@ -19,7 +19,7 @@
<button class="btn square"><i class="fa fa-filter"></i></button>
</div>
</div>
<div class="list-vertical scrollable">
<div class="list-vertical scrollable" :class="{'avoid-clicks': disableList}">
<equipment v-for="(m,k) in magpos" :key="k" :code="'Magazzino' + ' ' + m.magazineId" :title="'Manina' + ' ' + m.positionId"
:class="{selected: selectedTool && selectedTool.positionId == m.positionId && selectedTool.magazineId == m.magazineId }"
:img-source="'../assets/images/list-mag-pos.PNG'"
@@ -31,7 +31,7 @@
<!-- <button class="btn"><i class="fa fa-trash"></i></button> -->
<div class="box-right-label-header">{{'tooling_magpos_boxright_header_modify' | localize("Modifica della Manina")}} {{selectedTool.id}} {{'tooling_magpos_boxright_header_modify_mag' | localize("nel Magazzino")}} {{selectedTool.magazineId}}</div>
<div class="list-skill-magpos scrollable">
<div class="list-skill-magpos-category">
<div class="list-skill-magpos-category" :class="{'avoid-clicks': !disableList}">
<div class="skill-magpos-category">{{'tooling_magpos_list_category_general' | localize("Generali")}}</div>
<input-box v-for="m in magposConfiguration" :key="m.name"
v-if="m.name != ''"
Step/wwwroot/src/components/tooling-shanks.ts
+7
View File
@@ -29,6 +29,7 @@ export default class toolingShanks extends Vue {
public enableParameters: boolean = true;
public enableEquipment: boolean = false;
public selectedTool: any = null;
public disableList: any = false;
public enableModify: any = false;
@@ -53,12 +54,14 @@ export default class toolingShanks extends Vue {
public modify(){
this.enableModify = true;
this.disableList = true;
}
public addShank(){
this.selectedTool = {};
this.shankConfiguration = [];
this.enableModify = true;
for(let f in (this.$store.state as AppModel).tooling.shankConfiguration){
let element = (this.$store.state as AppModel).tooling.shankConfiguration[f];
@@ -66,6 +69,7 @@ export default class toolingShanks extends Vue {
this.shankConfiguration.push(element);
}
}
this.disableList = true;
}
public selectTool(item){
@@ -97,6 +101,7 @@ export default class toolingShanks extends Vue {
public cancel = function () {
this.selectedTool = null;
this.disableList = false;
}
@@ -117,6 +122,7 @@ export default class toolingShanks extends Vue {
htmlelement.scrollTop = htmlelement.scrollHeight;
this.shankConfiguration = (this.$store.state as AppModel).tooling.shankConfiguration;
this.disableList = false;
});
}
@@ -124,6 +130,7 @@ export default class toolingShanks extends Vue {
new ToolingService().UpdateShank(model).then(response => {
this.shankConfiguration = (this.$store.state as AppModel).tooling.shankConfiguration;
this.disableList = false;
});
}
Step/wwwroot/src/components/tooling-shanks.vue
+4 -4
View File
@@ -19,7 +19,7 @@
<button class="btn square"><i class="fa fa-filter"></i></button>
</div>
</div>
<div class="list-vertical scrollable" ref="shankList">
<div class="list-vertical scrollable" ref="shankList" :class="{'avoid-clicks': disableList}">
<equipment v-for="s in shanks" :key="s.id" :title="'Codolo' + ' ' + s.id"
v-if="s.id != null"
:img-source="'../assets/images/list-shank.PNG'"
@@ -27,7 +27,7 @@
@click="selectTool(s)"></equipment>
</div>
<div class="footer">
<div class="group-label-button">{{'tooling_shanks_label_add' | localize("Aggiungi codolo")}}<button class="btn" @click="addShank()"><i class="fa fa-plus"></i></button></div>
<div class="group-label-button" :class="{'avoid-clicks': disableList}">{{'tooling_shanks_label_add' | localize("Aggiungi codolo")}}<button class="btn" @click="addShank()"><i class="fa fa-plus"></i></button></div>
</div>
</div>
@@ -35,7 +35,7 @@
<!-- Siemens -->
<div class="box-right" v-if="(isSiemens() || isDemo()) && selectedTool">
<div class="tab-box-right">
<div class="tab-box-right" :class="{'avoid-clicks': disableList}">
<button class="tab" :class="{'active': enableParameters}" @click="selectTab('Parameters')">Parametri</button>
<div class="tab-box-scroll">
<button v-for="ct in selectedTool.childsTools" :key="ct.id" class="tab" :class="{'active': enableEquipment == ct.id}" @click="selectTab(ct.id)">{{'tooling_childtoolsfamily_skill_tools' | localize(" Utensile")}} {{ct.id}}</button>
@@ -45,7 +45,7 @@
<button class="btn deleteElement" @click="deleteShank(selectedTool)"><i class="fa fa-trash"></i></button>
<div class="box-right-label-header">{{'tooling_shanks_boxright_header_modify' | localize("Modifica di Codolo")}} {{selectedTool.id}}</div>
<div class="list-skill-shanks scrollable">
<div class="list-skill-shanks-category" v-for="c in categories" :key="c">
<div class="list-skill-shanks-category" v-for="c in categories" :key="c" :class="{'avoid-clicks': !disableList}">
<div class="skill-shanks-category">{{'tooling_shanks_list_category_' + c | localize(c)}}</div>
<input-box v-for="s in shankConfiguration" :key="s.name"
v-if="s.name != '' && s.category == c"