diff --git a/Step/wwwroot/assets/styles/base/card.less b/Step/wwwroot/assets/styles/base/card.less index 08c6d583..897c7e47 100644 --- a/Step/wwwroot/assets/styles/base/card.less +++ b/Step/wwwroot/assets/styles/base/card.less @@ -105,6 +105,7 @@ display: flex; flex-flow: row; align-self: center; + margin: auto; justify-items: center; font-size: 18px; line-height: 1.11; diff --git a/Step/wwwroot/assets/styles/base/tooling-equipment.less b/Step/wwwroot/assets/styles/base/tooling-equipment.less index 20ac43ae..14a75a85 100644 --- a/Step/wwwroot/assets/styles/base/tooling-equipment.less +++ b/Step/wwwroot/assets/styles/base/tooling-equipment.less @@ -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'); diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index d6468af5..3c1abb81 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -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); diff --git a/Step/wwwroot/src/@types/tooling.d.ts b/Step/wwwroot/src/@types/tooling.d.ts index a2011703..4f3249bf 100644 --- a/Step/wwwroot/src/@types/tooling.d.ts +++ b/Step/wwwroot/src/@types/tooling.d.ts @@ -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 + } } diff --git a/Step/wwwroot/src/components/tooling-equipment.ts b/Step/wwwroot/src/components/tooling-equipment.ts new file mode 100644 index 00000000..57bcabe6 --- /dev/null +++ b/Step/wwwroot/src/components/tooling-equipment.ts @@ -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(); + + } + +} diff --git a/Step/wwwroot/src/components/tooling-equipment.vue b/Step/wwwroot/src/components/tooling-equipment.vue index 593016a0..7ea8a13d 100644 --- a/Step/wwwroot/src/components/tooling-equipment.vue +++ b/Step/wwwroot/src/components/tooling-equipment.vue @@ -17,30 +17,21 @@