diff --git a/Step/wwwroot/assets/styles/base/modals.less b/Step/wwwroot/assets/styles/base/modals.less index 6cbee0dd..b18a9035 100644 --- a/Step/wwwroot/assets/styles/base/modals.less +++ b/Step/wwwroot/assets/styles/base/modals.less @@ -23,6 +23,8 @@ sans-serif; @modal-load-program-width: 1808px; @modal-job-add-parameter-width: 704px; @modal-job-add-parameter-height: 608px; +@modal-edit-job-width: 952px; +@modal-edit-job-height: 872px; @modal-iframe-height: 800px; @modal-iframe-width: 1800px; @modal-user-info-height: 610px; @@ -1069,6 +1071,56 @@ sans-serif; } } } + .items-list{ + width: 475px; + min-height: 191px; + display: flex; + flex-flow: column; + .group-item{ + width: 100%; + min-height: 128px; + display: flex; + flex-flow: column; + .item{ + width: 100%; + height: 48px; + display: flex; + flex-flow: row; + align-items: center; + .number{ + font-size: 18px; + line-height: 1.11; + color: @color-greyish-brown; + margin-right: 16px; + } + .input-text-box{ + margin-right: 8px; + input{ + width: 304px; + height: 48px; + border-radius: 2px; + box-shadow: inset 0 1px 3px 0 @color-black-50; + border: solid 1px @color-silver; + } + } + .group-button{ + button.btn{ + padding: 0 12px; + .fa{ + font-size: 24px; + } + } + } + } + .item:first-child{ + margin-top: 12px; + } + } + .add-item{ + width: 100%; + display: flex; + } + } } .job-add-parameter-footer{ width: 100%; @@ -1080,4 +1132,13 @@ sans-serif; justify-content: flex-end; } +} + +.@{modal}.modal-edit-job{ + width: @modal-edit-job-width; + height: @modal-edit-job-height; + border-radius: 2px; + top: calc(~'50%' - 392px); + left: calc(~'50%' - @modal-edit-job-width /2); + background-color: @color-background-white; } \ No newline at end of file diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index ce7435ad..824e9787 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -1008,6 +1008,54 @@ border: solid 1px #bbbcbc; margin: 16px; } +.modal.modal-job-add-parameter .job-add-parameter-body .items-list { + width: 475px; + min-height: 191px; + display: flex; + flex-flow: column; +} +.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item { + width: 100%; + min-height: 128px; + display: flex; + flex-flow: column; +} +.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item .item { + width: 100%; + height: 48px; + display: flex; + flex-flow: row; + align-items: center; +} +.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item .item .number { + font-size: 18px; + line-height: 1.11; + color: #4b4b4b; + margin-right: 16px; +} +.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item .item .input-text-box { + margin-right: 8px; +} +.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item .item .input-text-box input { + width: 304px; + height: 48px; + border-radius: 2px; + box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); + border: solid 1px #bbbcbc; +} +.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item .item .group-button button.btn { + padding: 0 12px; +} +.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item .item .group-button button.btn .fa { + font-size: 24px; +} +.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item .item:first-child { + margin-top: 12px; +} +.modal.modal-job-add-parameter .job-add-parameter-body .items-list .add-item { + width: 100%; + display: flex; +} .modal.modal-job-add-parameter .job-add-parameter-footer { width: 100%; height: 78px; @@ -1017,6 +1065,14 @@ align-items: center; justify-content: flex-end; } +.modal.modal-edit-job { + width: 952px; + height: 872px; + border-radius: 2px; + top: calc(50% - 392px); + left: calc(50% - 476px); + background-color: #fff; +} .row { display: flex; width: 100%; diff --git a/Step/wwwroot/src/app.modules.js b/Step/wwwroot/src/app.modules.js index 088c7add..890308b2 100644 --- a/Step/wwwroot/src/app.modules.js +++ b/Step/wwwroot/src/app.modules.js @@ -140,6 +140,9 @@ export const ModalLoadProgram = () => export const ModalJobAddParameter = () => import ("./modules/base-components/modal-job-add-parameter.vue"); +export const ModalEditJob = () => + import ("./modules/base-components/modal-edit-job.vue"); + export const ProgramManagement = () => import ("./modules/program-management.vue"); @@ -150,4 +153,4 @@ export const TestEmpty = () => import ("./components/test-empty.vue"); export const TestHeader = () => import ("./components/test-status.vue"); - import ("./components/test-status.vue"); \ No newline at end of file +import ("./components/test-status.vue"); \ No newline at end of file diff --git a/Step/wwwroot/src/app.routes.js b/Step/wwwroot/src/app.routes.js index 786dd57f..4fe12e0f 100644 --- a/Step/wwwroot/src/app.routes.js +++ b/Step/wwwroot/src/app.routes.js @@ -43,7 +43,8 @@ import { CardProductionSectionFile, ModalLoadProgram, ProgramManagement, - ModalJobAddParameter + ModalJobAddParameter, + ModalEditJob } from "./app.modules"; export let routes = [ @@ -77,6 +78,7 @@ export let routes = [ { path: "/modal-load-program", component: ModalLoadProgram, meta: { title: "Step - Modal-Load-Program", area: "modal-load-program" } }, { path: "/modal-job-add-parameter", component: ModalJobAddParameter, meta: { title: "Step - Modal-Job-Add-Parameter", area: "modal-job-add-parameter" } }, + { path: "/modal-edit-job", component: ModalEditJob, meta: { title: "Step - Modal-Edit-Job", area: "modal-edit-job" } }, { path: "/card-folder-path", component: CardFolderPath, meta: { title: "Step - Card-Folder-Path", area: "card-folder-path" } }, { path: "/card-element-queue", component: CardElementQueue, meta: { title: "Step - Card-Element-Queue", area: "card-element-queue" } }, diff --git a/Step/wwwroot/src/modules/base-components/modal-edit-job.vue b/Step/wwwroot/src/modules/base-components/modal-edit-job.vue new file mode 100644 index 00000000..2d532d88 --- /dev/null +++ b/Step/wwwroot/src/modules/base-components/modal-edit-job.vue @@ -0,0 +1,22 @@ + + \ No newline at end of file diff --git a/Step/wwwroot/src/modules/base-components/modal-job-add-parameter.vue b/Step/wwwroot/src/modules/base-components/modal-job-add-parameter.vue index 6d4f2834..b3577741 100644 --- a/Step/wwwroot/src/modules/base-components/modal-job-add-parameter.vue +++ b/Step/wwwroot/src/modules/base-components/modal-job-add-parameter.vue @@ -25,6 +25,24 @@
+
+
+
+ 1 +
+
+ +
+
+ + + +
+
+
+
+ +
-
+
+
@@ -94,25 +100,36 @@ export default { selectedFile: null, driveList: {}, fileList: {}, + arrayList: [], + arrayViewList: [], dirPath: "C:\\" } }, mounted: function (){ + debugger if (typeof cmsClient != "undefined"){ this.driveList = JSON.parse(cmsClient.getOSdriveList()) this.fileList = JSON.parse(cmsClient.getFileList(this.dirPath)) + console.log(this.fileList); } }, watch:{ - dirPath: function(){ + dirPath: function(){ + debugger if (typeof cmsClient != "undefined") this.fileList = JSON.parse(cmsClient.getFileList(this.dirPath)) + this.arrayList.push(this.fileList); + console.log(this.fileList); + console.log(this.arrayList); } }, methods:{ changePath(str){ - this.selectElementSecond() + this.selectElementSecond(); + if(this.arrayList.length > 1){ + this.selectElementThird(); + } this.enableSelectedItem = false; this.dirPath = str; }, diff --git a/Step/wwwroot/src/modules/login.ts b/Step/wwwroot/src/modules/login.ts index 5f41d326..da6448b4 100644 --- a/Step/wwwroot/src/modules/login.ts +++ b/Step/wwwroot/src/modules/login.ts @@ -33,9 +33,9 @@ export default class Login extends Vue { Factory.Get(MessageService).subscribeToChannel("force-ui-update", args => { this.$forceUpdate(); }); - document.body.addEventListener('keyup', e => { - if (e.keyCode === 27) { - iziToast.warning({title: "Write username and password"} as IziToastSettings); + document.body.addEventListener('keydown', function(e) { + if (e.keyCode == 27) { + return false; } }) diff --git a/Step/wwwroot/src/modules/login.vue b/Step/wwwroot/src/modules/login.vue index 057b6a16..6d53606d 100644 --- a/Step/wwwroot/src/modules/login.vue +++ b/Step/wwwroot/src/modules/login.vue @@ -1,5 +1,5 @@