fix Modal & @/src/components/ refrences

2018-11-13 18:58:00 +01:00
parent a1a95679d9
commit ecf9b331ee
20 changed files with 70 additions and 71 deletions
@@ -38,7 +38,7 @@ import { DataService } from "src/services/dataService";
 import { Factory, MessageService } from "./_base";
 import { ModalContainer, ModalHelper } from "./modules/base-components";
 import { appModelActions } from "src/store";
-import { underTheHood } from "src/app_modules/under-the-hood/components";
+import { underTheHood } from "src/app_modules/under-the-hood";

 import * as iziToast from "izitoast";
 import moment from "moment";
@@ -104,7 +104,7 @@ export let routes = [

  { path: "/missing-tool", component: MissingTool, meta: { title: "Missing Tool", area: "missing-tool" } },

-  { path: "/modal-missing-tools", component: ModalMissingTools, meta: { title: "Modal Missing Tools", area: "modal-missing-tools" } },
+  // { path: "/modal-missing-tools", component: ModalMissingTools, meta: { title: "Modal Missing Tools", area: "modal-missing-tools" } },

  { path: "/program-management", component: ProgramManagement, meta: { title: "Program-Management", area: "program-management" } },

@@ -2,7 +2,7 @@ import Vue from "vue";

 import cardQueueProduction from "./card-queue-production.vue";
 import cardJobProduction from "./card-job-production.vue";
-import { ModalHelper,Modal } from "@/src/components/modals";
+import { ModalHelper,Modal } from "src/components/modals";
 import modalLoadProgram from "src/modules/base-components/modal-load-program.vue";
 import { Hub } from "src/services/hub";
 import Component from "vue-class-component";
@@ -10,7 +10,7 @@ import { appModelActions, alarmsModelActions, store } from "src/store";
 import { DataService } from 'src/services/dataService';
 import Component from "vue-class-component";
 import { Watch } from "vue-property-decorator";
-import { ModalHelper } from "@/src/components/modals";
+import { ModalHelper } from "src/components/modals";

@Component({
  components: {
@@ -2,7 +2,7 @@
 import Vue from "vue";
 import Component from "vue-class-component";
 import { Watch, Prop } from "vue-property-decorator";
-import { ModalHelper,Modal } from "@/src/components/modals";
+import { ModalHelper,Modal } from "src/components/modals";

@Component({ components: { modal: Modal } })
 export default class AssistedTooling extends Vue {
@@ -1,7 +1,7 @@
 import Vue from "vue";
 import Component from "vue-class-component";
 import { Watch, Prop } from "vue-property-decorator";
-import { ModalHelper,Modal } from "@/src/components/modals";
+import { ModalHelper,Modal } from "src/components/modals";
 import { cardAssistedTooling } from "src/modules/base-components/cards";

@Component({ components: { cardAssistedTooling, modal: Modal } })
@@ -1,7 +1,7 @@
 import Vue from "vue";
 import Component from "vue-class-component";
 import { Watch, Prop } from "vue-property-decorator";
-import { ModalHelper, Modal } from "@/src/components/modals";
+import { ModalHelper, Modal } from "src/components/modals";
 import { cardAssistedTooling } from "src/modules/base-components/cards";


@@ -1,7 +1,7 @@
 import Vue from "vue";
 import Component from "vue-class-component";
 import { Watch, Prop } from "vue-property-decorator";
-import { ModalHelper, Modal } from "@/src/components/modals";
+import { ModalHelper, Modal } from "src/components/modals";
 import { cardAssistedTooling } from "src/modules/base-components/cards";

@Component({ components: { cardAssistedTooling, modal: Modal } })
@@ -6,7 +6,7 @@ import { store, AppModel } from "src/store";
 import { DepotService, ToolingService } from 'src/services';

 import { Factory, MessageService } from 'src/_base';
-import { Modal, ModalHelper } from "@/src/components/modals";
+import { Modal, ModalHelper } from "src/components/modals";

@Component({
  name: "infoEquipment",
@@ -15,7 +15,7 @@ import { MessageService, Factory, awaiter } from "src/_base";
 import { Container, Draggable } from "vue-smooth-dnd";

 import { DepotActionLoading, DepotActionUnloading, DepotActionTransfer, DepotActionGeneric, InfoEquipment } from "../index";
-import { Modal, ModalHelper } from "@/src/components/modals";
+import { Modal, ModalHelper } from "src/components/modals";

 declare let $: any;

@@ -9,7 +9,7 @@ import { Watch } from "vue-property-decorator";
 import { DepotActionLoading, DepotActionUnloading, DepotActionTransfer, DepotActionGeneric } from "../index";
 import { awaiter } from "src/_base";
 import { Hub } from "src/services/hub";
-import { ModalHelper } from "@/src/components/modals";
+import { ModalHelper } from "src/components/modals";
 declare let $: any;

@Component({ components: { equipment, inputBox } })
@@ -5,7 +5,7 @@ import { ToolingService } from "src/services/toolingService";
 import { store, AppModel } from "src/store";
 import { toolingActions } from "src/store/tooling.store";
 import { Watch } from "vue-property-decorator";
-import { ModalHelper,Modal } from "@/src/components/modals";
+import { ModalHelper,Modal } from "src/components/modals";
 import { DepotActionLoading, DepotActionUnloading, DepotActionTransfer, DepotActionGeneric } from "../index";
 import { awaiter } from "src/_base";

@@ -7,7 +7,7 @@ import { Hub } from "src/services/hub";
 import { Watch } from "vue-property-decorator";
 import { DepotActionLoading, DepotActionUnloading, DepotActionTransfer, DepotActionGeneric } from "../";
 import { awaiter } from "src/_base";
-import { ModalHelper } from "@/src/components/modals";
+import { ModalHelper } from "src/components/modals";

@Component({ name: "tooling", components: { card: card } })

@@ -1,8 +1,7 @@
 import Vue from "vue";
 import Component from "vue-class-component";
-import Modal from "src/modules/base-components/modal.vue";

-import { Factory, MessageService, awaiter } from "../../_base";
+import { Factory, MessageService, awaiter } from "src/_base";
 import moment from "moment";
 import cardFolderPath from "./cards/card-folder-path.vue";
 import cardElementQueue from "src/app_modules/production/components/card-element-queue.vue";
@@ -10,7 +9,7 @@ import * as iziToast from "izitoast";
 import { fileService } from "src/services";

 import ModalEditJob from "./modal-edit-job.vue";
-import { ModalHelper } from "@/src/components/modals";
+import { ModalHelper, Modal } from "src/components/modals";

 declare var cmsClient: any;

@@ -17,53 +17,53 @@
    </div>
  </modal>
 </template>
-<script>
-import Modal from "src/modules/base-components/modal.vue";
-import { ModalHelper } from "src/modules/base-components/ModalHelper.ts";
-import { Factory, MessageService } from '../../_base';
+<script lang="ts">
+import { Modal, ModalHelper } from "src/components/modals";
+import { Factory, MessageService } from "src/_base";
 import { inputBox } from "src/modules/base-components/cards";
-import { ToolingService } from "../../services/toolingService";
+import { ToolingService } from "src/services/toolingService";
 export default {
-    components:{
-        modal: Modal, inputBox
-    },
-    data: function(){
-        return {
-            toolId: 0,
-            offsetId: [],
-            offsetDataTool: [],
-            availablePos:[],
-            maxOffsets: 0,
-            posSelected: 0,
-            offsetSelected: 0
-        }
-    },
-    beforeMount(){
-        var num;
-        this.toolId = ModalHelper.offsetAddModal.idTool;
-        this.offsetDataTool = ModalHelper.offsetAddModal.offsetData;
-        this.maxOffsets = (this.$store.state).tooling.maxOffsets;
-        for(let k = 1; k <= this.maxOffsets; k++){
-            this.offsetId.push(k);
-        }
-        for(const key in this.offsetDataTool){
-            if(this.offsetDataTool[key] == null){
-                num = parseInt(key) + 1;
-                this.availablePos.push(num);
-            }
-        }
-    },
-    methods:{
-        close() {
-            Factory.Get(MessageService).deleteChannel("esc_pressed");
-            ModalHelper.HideModal();
-        },
-        async addOffsetToTool(pos, offsetId){
-            await new ToolingService().AddOffsetToToolPosition(pos, this.toolId, offsetId).then(response => {
-
-            });
-            ModalHelper.HideModal();
-        }
+  components: {
+    modal: Modal,
+    inputBox
+  },
+  data: function() {
+    return {
+      toolId: 0,
+      offsetId: [],
+      offsetDataTool: [],
+      availablePos: [],
+      maxOffsets: 0,
+      posSelected: 0,
+      offsetSelected: 0
+    };
+  },
+  beforeMount() {
+    var num;
+    this.toolId = ModalHelper.offsetAddModal.idTool;
+    this.offsetDataTool = ModalHelper.offsetAddModal.offsetData;
+    this.maxOffsets = this.$store.state.tooling.maxOffsets;
+    for (let k = 1; k <= this.maxOffsets; k++) {
+      this.offsetId.push(k);
    }
+    for (const key in this.offsetDataTool) {
+      if (this.offsetDataTool[key] == null) {
+        num = parseInt(key) + 1;
+        this.availablePos.push(num);
+      }
+    }
+  },
+  methods: {
+    close() {
+      Factory.Get(MessageService).deleteChannel("esc_pressed");
+      ModalHelper.HideModal();
+    },
+    async addOffsetToTool(pos, offsetId) {
+      await new ToolingService()
+        .AddOffsetToToolPosition(pos, this.toolId, offsetId)
+        .then(response => {});
+      ModalHelper.HideModal();
+    }
+  }
 };
-</script>
+</script>
@@ -1,6 +1,6 @@
 import Vue from "vue";

-import { ModalHelper,Modal } from "@/src/components/modals";
+import { ModalHelper,Modal } from "src/components/modals";
 import { Factory, MessageService } from '../../_base';
 import { tool } from "src/modules/base-components/cards";
 import { inputBox } from "src/modules/base-components/cards";
@@ -1,7 +1,7 @@
 import Vue from "vue";

-import { ModalHelper,Modal } from "@/src/components/modals";
-import { Factory, MessageService } from '../../_base';
+import { ModalHelper,Modal } from "src/components/modals";
+import { Factory, MessageService } from 'src/_base';
 import Component from "vue-class-component";
 import { Deferred } from "src/services/Deferred";
 import { Prop } from "vue-property-decorator";
@@ -1,7 +1,7 @@
 import Vue from "vue";
 import Component from "vue-class-component";

-import { ModalHelper,Modal } from "@/src/components/modals";
+import { ModalHelper,Modal } from "src/components/modals";
 import { Factory, MessageService, awaiter } from "../../_base";
 // import { MaintenanceService } from "../services/maintenanceService";
 // import { store } from "src/store";
@@ -1,13 +1,13 @@
 import Vue from "vue";
-import Modal from "src/modules/base-components/modal.vue";

-import { Factory, MessageService } from '../../_base';
+
+import { Factory, MessageService } from 'src/_base';
 import missingTool from "src/modules/base-components/cards/missing-tool.vue";
 import Component from "vue-class-component";
 import { Deferred } from "../../services/Deferred";
 import { Prop } from "vue-property-decorator";
 import { relativeTimeThreshold } from "moment";
-import { ModalHelper } from "@/src/components/modals";
+import { ModalHelper, Modal } from "src/components/modals";



@@ -1,12 +1,12 @@
 import Vue from "vue";
-import Modal from "src/modules/base-components/modal.vue";
+

 import { Factory, MessageService,awaiter } from '../_base';
 import { MaintenanceService } from "../services/maintenanceService";
 import moment from "moment";
 import Component from "vue-class-component";
 import DatePicker from "vue2-datepicker";
-import { ModalHelper } from "src/components/modals";
+import { ModalHelper, Modal } from "src/components/modals";

@Component({
  components: { modal: Modal, datePicker: DatePicker },