diff --git a/src/assets/images/order/fp_icon.png b/src/assets/images/order/fp_icon.png new file mode 100644 index 0000000..b21e5d2 --- /dev/null +++ b/src/assets/images/order/fp_icon.png Binary files differ diff --git a/src/assets/images/order/fp_icon.png b/src/assets/images/order/fp_icon.png new file mode 100644 index 0000000..b21e5d2 --- /dev/null +++ b/src/assets/images/order/fp_icon.png Binary files differ diff --git a/src/assets/images/order/gdbg_img.png b/src/assets/images/order/gdbg_img.png new file mode 100644 index 0000000..9760166 --- /dev/null +++ b/src/assets/images/order/gdbg_img.png Binary files differ diff --git a/src/assets/images/order/fp_icon.png b/src/assets/images/order/fp_icon.png new file mode 100644 index 0000000..b21e5d2 --- /dev/null +++ b/src/assets/images/order/fp_icon.png Binary files differ diff --git a/src/assets/images/order/gdbg_img.png b/src/assets/images/order/gdbg_img.png new file mode 100644 index 0000000..9760166 --- /dev/null +++ b/src/assets/images/order/gdbg_img.png Binary files differ diff --git a/src/assets/images/order/gddj_icon.png b/src/assets/images/order/gddj_icon.png new file mode 100644 index 0000000..964c4b1 --- /dev/null +++ b/src/assets/images/order/gddj_icon.png Binary files differ diff --git a/src/assets/images/order/fp_icon.png b/src/assets/images/order/fp_icon.png new file mode 100644 index 0000000..b21e5d2 --- /dev/null +++ b/src/assets/images/order/fp_icon.png Binary files differ diff --git a/src/assets/images/order/gdbg_img.png b/src/assets/images/order/gdbg_img.png new file mode 100644 index 0000000..9760166 --- /dev/null +++ b/src/assets/images/order/gdbg_img.png Binary files differ diff --git a/src/assets/images/order/gddj_icon.png b/src/assets/images/order/gddj_icon.png new file mode 100644 index 0000000..964c4b1 --- /dev/null +++ b/src/assets/images/order/gddj_icon.png Binary files differ diff --git a/src/assets/images/order/hs_icon.png b/src/assets/images/order/hs_icon.png new file mode 100644 index 0000000..c29fb66 --- /dev/null +++ b/src/assets/images/order/hs_icon.png Binary files differ diff --git a/src/assets/images/order/fp_icon.png b/src/assets/images/order/fp_icon.png new file mode 100644 index 0000000..b21e5d2 --- /dev/null +++ b/src/assets/images/order/fp_icon.png Binary files differ diff --git a/src/assets/images/order/gdbg_img.png b/src/assets/images/order/gdbg_img.png new file mode 100644 index 0000000..9760166 --- /dev/null +++ b/src/assets/images/order/gdbg_img.png Binary files differ diff --git a/src/assets/images/order/gddj_icon.png b/src/assets/images/order/gddj_icon.png new file mode 100644 index 0000000..964c4b1 --- /dev/null +++ b/src/assets/images/order/gddj_icon.png Binary files differ diff --git a/src/assets/images/order/hs_icon.png b/src/assets/images/order/hs_icon.png new file mode 100644 index 0000000..c29fb66 --- /dev/null +++ b/src/assets/images/order/hs_icon.png Binary files differ diff --git a/src/assets/images/order/ja_icon.png b/src/assets/images/order/ja_icon.png new file mode 100644 index 0000000..776fd3e --- /dev/null +++ b/src/assets/images/order/ja_icon.png Binary files differ diff --git a/src/assets/images/order/fp_icon.png b/src/assets/images/order/fp_icon.png new file mode 100644 index 0000000..b21e5d2 --- /dev/null +++ b/src/assets/images/order/fp_icon.png Binary files differ diff --git a/src/assets/images/order/gdbg_img.png b/src/assets/images/order/gdbg_img.png new file mode 100644 index 0000000..9760166 --- /dev/null +++ b/src/assets/images/order/gdbg_img.png Binary files differ diff --git a/src/assets/images/order/gddj_icon.png b/src/assets/images/order/gddj_icon.png new file mode 100644 index 0000000..964c4b1 --- /dev/null +++ b/src/assets/images/order/gddj_icon.png Binary files differ diff --git a/src/assets/images/order/hs_icon.png b/src/assets/images/order/hs_icon.png new file mode 100644 index 0000000..c29fb66 --- /dev/null +++ b/src/assets/images/order/hs_icon.png Binary files differ diff --git a/src/assets/images/order/ja_icon.png b/src/assets/images/order/ja_icon.png new file mode 100644 index 0000000..776fd3e --- /dev/null +++ b/src/assets/images/order/ja_icon.png Binary files differ diff --git a/src/assets/images/order/sb_icon.png b/src/assets/images/order/sb_icon.png new file mode 100644 index 0000000..c51fc26 --- /dev/null +++ b/src/assets/images/order/sb_icon.png Binary files differ diff --git a/src/assets/images/order/fp_icon.png b/src/assets/images/order/fp_icon.png new file mode 100644 index 0000000..b21e5d2 --- /dev/null +++ b/src/assets/images/order/fp_icon.png Binary files differ diff --git a/src/assets/images/order/gdbg_img.png b/src/assets/images/order/gdbg_img.png new file mode 100644 index 0000000..9760166 --- /dev/null +++ b/src/assets/images/order/gdbg_img.png Binary files differ diff --git a/src/assets/images/order/gddj_icon.png b/src/assets/images/order/gddj_icon.png new file mode 100644 index 0000000..964c4b1 --- /dev/null +++ b/src/assets/images/order/gddj_icon.png Binary files differ diff --git a/src/assets/images/order/hs_icon.png b/src/assets/images/order/hs_icon.png new file mode 100644 index 0000000..c29fb66 --- /dev/null +++ b/src/assets/images/order/hs_icon.png Binary files differ diff --git a/src/assets/images/order/ja_icon.png b/src/assets/images/order/ja_icon.png new file mode 100644 index 0000000..776fd3e --- /dev/null +++ b/src/assets/images/order/ja_icon.png Binary files differ diff --git a/src/assets/images/order/sb_icon.png b/src/assets/images/order/sb_icon.png new file mode 100644 index 0000000..c51fc26 --- /dev/null +++ b/src/assets/images/order/sb_icon.png Binary files differ diff --git a/src/assets/images/order/sl_icon.png b/src/assets/images/order/sl_icon.png new file mode 100644 index 0000000..c76998f --- /dev/null +++ b/src/assets/images/order/sl_icon.png Binary files differ diff --git a/src/assets/images/order/fp_icon.png b/src/assets/images/order/fp_icon.png new file mode 100644 index 0000000..b21e5d2 --- /dev/null +++ b/src/assets/images/order/fp_icon.png Binary files differ diff --git a/src/assets/images/order/gdbg_img.png b/src/assets/images/order/gdbg_img.png new file mode 100644 index 0000000..9760166 --- /dev/null +++ b/src/assets/images/order/gdbg_img.png Binary files differ diff --git a/src/assets/images/order/gddj_icon.png b/src/assets/images/order/gddj_icon.png new file mode 100644 index 0000000..964c4b1 --- /dev/null +++ b/src/assets/images/order/gddj_icon.png Binary files differ diff --git a/src/assets/images/order/hs_icon.png b/src/assets/images/order/hs_icon.png new file mode 100644 index 0000000..c29fb66 --- /dev/null +++ b/src/assets/images/order/hs_icon.png Binary files differ diff --git a/src/assets/images/order/ja_icon.png b/src/assets/images/order/ja_icon.png new file mode 100644 index 0000000..776fd3e --- /dev/null +++ b/src/assets/images/order/ja_icon.png Binary files differ diff --git a/src/assets/images/order/sb_icon.png b/src/assets/images/order/sb_icon.png new file mode 100644 index 0000000..c51fc26 --- /dev/null +++ b/src/assets/images/order/sb_icon.png Binary files differ diff --git a/src/assets/images/order/sl_icon.png b/src/assets/images/order/sl_icon.png new file mode 100644 index 0000000..c76998f --- /dev/null +++ b/src/assets/images/order/sl_icon.png Binary files differ diff --git a/src/assets/images/order/tj_icon.png b/src/assets/images/order/tj_icon.png new file mode 100644 index 0000000..207746b --- /dev/null +++ b/src/assets/images/order/tj_icon.png Binary files differ diff --git a/src/assets/images/order/fp_icon.png b/src/assets/images/order/fp_icon.png new file mode 100644 index 0000000..b21e5d2 --- /dev/null +++ b/src/assets/images/order/fp_icon.png Binary files differ diff --git a/src/assets/images/order/gdbg_img.png b/src/assets/images/order/gdbg_img.png new file mode 100644 index 0000000..9760166 --- /dev/null +++ b/src/assets/images/order/gdbg_img.png Binary files differ diff --git a/src/assets/images/order/gddj_icon.png b/src/assets/images/order/gddj_icon.png new file mode 100644 index 0000000..964c4b1 --- /dev/null +++ b/src/assets/images/order/gddj_icon.png Binary files differ diff --git a/src/assets/images/order/hs_icon.png b/src/assets/images/order/hs_icon.png new file mode 100644 index 0000000..c29fb66 --- /dev/null +++ b/src/assets/images/order/hs_icon.png Binary files differ diff --git a/src/assets/images/order/ja_icon.png b/src/assets/images/order/ja_icon.png new file mode 100644 index 0000000..776fd3e --- /dev/null +++ b/src/assets/images/order/ja_icon.png Binary files differ diff --git a/src/assets/images/order/sb_icon.png b/src/assets/images/order/sb_icon.png new file mode 100644 index 0000000..c51fc26 --- /dev/null +++ b/src/assets/images/order/sb_icon.png Binary files differ diff --git a/src/assets/images/order/sl_icon.png b/src/assets/images/order/sl_icon.png new file mode 100644 index 0000000..c76998f --- /dev/null +++ b/src/assets/images/order/sl_icon.png Binary files differ diff --git a/src/assets/images/order/tj_icon.png b/src/assets/images/order/tj_icon.png new file mode 100644 index 0000000..207746b --- /dev/null +++ b/src/assets/images/order/tj_icon.png Binary files differ diff --git a/src/assets/images/order/xy_icon.png b/src/assets/images/order/xy_icon.png new file mode 100644 index 0000000..71c6d9b --- /dev/null +++ b/src/assets/images/order/xy_icon.png Binary files differ diff --git a/src/assets/images/order/fp_icon.png b/src/assets/images/order/fp_icon.png new file mode 100644 index 0000000..b21e5d2 --- /dev/null +++ b/src/assets/images/order/fp_icon.png Binary files differ diff --git a/src/assets/images/order/gdbg_img.png b/src/assets/images/order/gdbg_img.png new file mode 100644 index 0000000..9760166 --- /dev/null +++ b/src/assets/images/order/gdbg_img.png Binary files differ diff --git a/src/assets/images/order/gddj_icon.png b/src/assets/images/order/gddj_icon.png new file mode 100644 index 0000000..964c4b1 --- /dev/null +++ b/src/assets/images/order/gddj_icon.png Binary files differ diff --git a/src/assets/images/order/hs_icon.png b/src/assets/images/order/hs_icon.png new file mode 100644 index 0000000..c29fb66 --- /dev/null +++ b/src/assets/images/order/hs_icon.png Binary files differ diff --git a/src/assets/images/order/ja_icon.png b/src/assets/images/order/ja_icon.png new file mode 100644 index 0000000..776fd3e --- /dev/null +++ b/src/assets/images/order/ja_icon.png Binary files differ diff --git a/src/assets/images/order/sb_icon.png b/src/assets/images/order/sb_icon.png new file mode 100644 index 0000000..c51fc26 --- /dev/null +++ b/src/assets/images/order/sb_icon.png Binary files differ diff --git a/src/assets/images/order/sl_icon.png b/src/assets/images/order/sl_icon.png new file mode 100644 index 0000000..c76998f --- /dev/null +++ b/src/assets/images/order/sl_icon.png Binary files differ diff --git a/src/assets/images/order/tj_icon.png b/src/assets/images/order/tj_icon.png new file mode 100644 index 0000000..207746b --- /dev/null +++ b/src/assets/images/order/tj_icon.png Binary files differ diff --git a/src/assets/images/order/xy_icon.png b/src/assets/images/order/xy_icon.png new file mode 100644 index 0000000..71c6d9b --- /dev/null +++ b/src/assets/images/order/xy_icon.png Binary files differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 6ac8c83..0d7567e 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -135,7 +135,7 @@ padding: 20px; } -.publicContainer{ +.publicContainer { padding: 20px; } @@ -161,11 +161,13 @@ text-align: right; padding-right: 20px; transition: 600ms ease position; - background: linear-gradient(90deg, - rgba(32, 182, 249, 1) 0%, - rgba(32, 182, 249, 1) 0%, - rgba(33, 120, 241, 1) 100%, - rgba(33, 120, 241, 1) 100%); + background: linear-gradient( + 90deg, + rgba(32, 182, 249, 1) 0%, + rgba(32, 182, 249, 1) 0%, + rgba(33, 120, 241, 1) 100%, + rgba(33, 120, 241, 1) 100% + ); .subtitle { font-size: 20px; @@ -221,4 +223,10 @@ margin-right: 15px; cursor: pointer; } -} \ No newline at end of file +} + +// .pagingPosition { +// position: absolute !important; +// right: 0px; +// bottom: 0px; +// } diff --git a/src/assets/images/order/fp_icon.png b/src/assets/images/order/fp_icon.png new file mode 100644 index 0000000..b21e5d2 --- /dev/null +++ b/src/assets/images/order/fp_icon.png Binary files differ diff --git a/src/assets/images/order/gdbg_img.png b/src/assets/images/order/gdbg_img.png new file mode 100644 index 0000000..9760166 --- /dev/null +++ b/src/assets/images/order/gdbg_img.png Binary files differ diff --git a/src/assets/images/order/gddj_icon.png b/src/assets/images/order/gddj_icon.png new file mode 100644 index 0000000..964c4b1 --- /dev/null +++ b/src/assets/images/order/gddj_icon.png Binary files differ diff --git a/src/assets/images/order/hs_icon.png b/src/assets/images/order/hs_icon.png new file mode 100644 index 0000000..c29fb66 --- /dev/null +++ b/src/assets/images/order/hs_icon.png Binary files differ diff --git a/src/assets/images/order/ja_icon.png b/src/assets/images/order/ja_icon.png new file mode 100644 index 0000000..776fd3e --- /dev/null +++ b/src/assets/images/order/ja_icon.png Binary files differ diff --git a/src/assets/images/order/sb_icon.png b/src/assets/images/order/sb_icon.png new file mode 100644 index 0000000..c51fc26 --- /dev/null +++ b/src/assets/images/order/sb_icon.png Binary files differ diff --git a/src/assets/images/order/sl_icon.png b/src/assets/images/order/sl_icon.png new file mode 100644 index 0000000..c76998f --- /dev/null +++ b/src/assets/images/order/sl_icon.png Binary files differ diff --git a/src/assets/images/order/tj_icon.png b/src/assets/images/order/tj_icon.png new file mode 100644 index 0000000..207746b --- /dev/null +++ b/src/assets/images/order/tj_icon.png Binary files differ diff --git a/src/assets/images/order/xy_icon.png b/src/assets/images/order/xy_icon.png new file mode 100644 index 0000000..71c6d9b --- /dev/null +++ b/src/assets/images/order/xy_icon.png Binary files differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 6ac8c83..0d7567e 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -135,7 +135,7 @@ padding: 20px; } -.publicContainer{ +.publicContainer { padding: 20px; } @@ -161,11 +161,13 @@ text-align: right; padding-right: 20px; transition: 600ms ease position; - background: linear-gradient(90deg, - rgba(32, 182, 249, 1) 0%, - rgba(32, 182, 249, 1) 0%, - rgba(33, 120, 241, 1) 100%, - rgba(33, 120, 241, 1) 100%); + background: linear-gradient( + 90deg, + rgba(32, 182, 249, 1) 0%, + rgba(32, 182, 249, 1) 0%, + rgba(33, 120, 241, 1) 100%, + rgba(33, 120, 241, 1) 100% + ); .subtitle { font-size: 20px; @@ -221,4 +223,10 @@ margin-right: 15px; cursor: pointer; } -} \ No newline at end of file +} + +// .pagingPosition { +// position: absolute !important; +// right: 0px; +// bottom: 0px; +// } diff --git a/src/directive/common/setHeight.js b/src/directive/common/setHeight.js new file mode 100644 index 0000000..61bebd7 --- /dev/null +++ b/src/directive/common/setHeight.js @@ -0,0 +1,25 @@ +export default { + mounted: (el, binding) => { + el.resizeListener = () => { + setHeight(el, binding); + }; + + setHeight(el, binding); + window.addEventListener("resize", el.resizeListener); + }, + unmounted(el) { + window.removeEventListener("resize", el.resizeListener); + }, + updated(el, binding) { + setHeight(el, binding); + }, +}; + +function setHeight(el, binding) { + // const top = el.offsetTop; + const top = el.getBoundingClientRect().top; + const bottom = binding?.value?.bottom || 84; + const pageHeight = window.innerHeight; + el.style.height = pageHeight - top - bottom + "px"; + // el.style.overflowY = "auto"; +} diff --git a/src/assets/images/order/fp_icon.png b/src/assets/images/order/fp_icon.png new file mode 100644 index 0000000..b21e5d2 --- /dev/null +++ b/src/assets/images/order/fp_icon.png Binary files differ diff --git a/src/assets/images/order/gdbg_img.png b/src/assets/images/order/gdbg_img.png new file mode 100644 index 0000000..9760166 --- /dev/null +++ b/src/assets/images/order/gdbg_img.png Binary files differ diff --git a/src/assets/images/order/gddj_icon.png b/src/assets/images/order/gddj_icon.png new file mode 100644 index 0000000..964c4b1 --- /dev/null +++ b/src/assets/images/order/gddj_icon.png Binary files differ diff --git a/src/assets/images/order/hs_icon.png b/src/assets/images/order/hs_icon.png new file mode 100644 index 0000000..c29fb66 --- /dev/null +++ b/src/assets/images/order/hs_icon.png Binary files differ diff --git a/src/assets/images/order/ja_icon.png b/src/assets/images/order/ja_icon.png new file mode 100644 index 0000000..776fd3e --- /dev/null +++ b/src/assets/images/order/ja_icon.png Binary files differ diff --git a/src/assets/images/order/sb_icon.png b/src/assets/images/order/sb_icon.png new file mode 100644 index 0000000..c51fc26 --- /dev/null +++ b/src/assets/images/order/sb_icon.png Binary files differ diff --git a/src/assets/images/order/sl_icon.png b/src/assets/images/order/sl_icon.png new file mode 100644 index 0000000..c76998f --- /dev/null +++ b/src/assets/images/order/sl_icon.png Binary files differ diff --git a/src/assets/images/order/tj_icon.png b/src/assets/images/order/tj_icon.png new file mode 100644 index 0000000..207746b --- /dev/null +++ b/src/assets/images/order/tj_icon.png Binary files differ diff --git a/src/assets/images/order/xy_icon.png b/src/assets/images/order/xy_icon.png new file mode 100644 index 0000000..71c6d9b --- /dev/null +++ b/src/assets/images/order/xy_icon.png Binary files differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 6ac8c83..0d7567e 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -135,7 +135,7 @@ padding: 20px; } -.publicContainer{ +.publicContainer { padding: 20px; } @@ -161,11 +161,13 @@ text-align: right; padding-right: 20px; transition: 600ms ease position; - background: linear-gradient(90deg, - rgba(32, 182, 249, 1) 0%, - rgba(32, 182, 249, 1) 0%, - rgba(33, 120, 241, 1) 100%, - rgba(33, 120, 241, 1) 100%); + background: linear-gradient( + 90deg, + rgba(32, 182, 249, 1) 0%, + rgba(32, 182, 249, 1) 0%, + rgba(33, 120, 241, 1) 100%, + rgba(33, 120, 241, 1) 100% + ); .subtitle { font-size: 20px; @@ -221,4 +223,10 @@ margin-right: 15px; cursor: pointer; } -} \ No newline at end of file +} + +// .pagingPosition { +// position: absolute !important; +// right: 0px; +// bottom: 0px; +// } diff --git a/src/directive/common/setHeight.js b/src/directive/common/setHeight.js new file mode 100644 index 0000000..61bebd7 --- /dev/null +++ b/src/directive/common/setHeight.js @@ -0,0 +1,25 @@ +export default { + mounted: (el, binding) => { + el.resizeListener = () => { + setHeight(el, binding); + }; + + setHeight(el, binding); + window.addEventListener("resize", el.resizeListener); + }, + unmounted(el) { + window.removeEventListener("resize", el.resizeListener); + }, + updated(el, binding) { + setHeight(el, binding); + }, +}; + +function setHeight(el, binding) { + // const top = el.offsetTop; + const top = el.getBoundingClientRect().top; + const bottom = binding?.value?.bottom || 84; + const pageHeight = window.innerHeight; + el.style.height = pageHeight - top - bottom + "px"; + // el.style.overflowY = "auto"; +} diff --git a/src/directive/index.js b/src/directive/index.js index a6e88a1..7fec6ff 100644 --- a/src/directive/index.js +++ b/src/directive/index.js @@ -4,6 +4,7 @@ import divDrag from "./el-drag-div"; import dialogDrag from "./el-drag-dialog"; import divDownLoad from "./el-downLoad"; +import setHeight from './common/setHeight'; export default function directive(app) { app.directive("hasRole", hasRole); app.directive("hasPermi", hasPermi); @@ -11,4 +12,5 @@ app.directive("divDrag", divDrag); app.directive("dialogDrag", dialogDrag); app.directive("divDownLoad", divDownLoad); + app.directive('setHeight', setHeight); } diff --git a/src/assets/images/order/fp_icon.png b/src/assets/images/order/fp_icon.png new file mode 100644 index 0000000..b21e5d2 --- /dev/null +++ b/src/assets/images/order/fp_icon.png Binary files differ diff --git a/src/assets/images/order/gdbg_img.png b/src/assets/images/order/gdbg_img.png new file mode 100644 index 0000000..9760166 --- /dev/null +++ b/src/assets/images/order/gdbg_img.png Binary files differ diff --git a/src/assets/images/order/gddj_icon.png b/src/assets/images/order/gddj_icon.png new file mode 100644 index 0000000..964c4b1 --- /dev/null +++ b/src/assets/images/order/gddj_icon.png Binary files differ diff --git a/src/assets/images/order/hs_icon.png b/src/assets/images/order/hs_icon.png new file mode 100644 index 0000000..c29fb66 --- /dev/null +++ b/src/assets/images/order/hs_icon.png Binary files differ diff --git a/src/assets/images/order/ja_icon.png b/src/assets/images/order/ja_icon.png new file mode 100644 index 0000000..776fd3e --- /dev/null +++ b/src/assets/images/order/ja_icon.png Binary files differ diff --git a/src/assets/images/order/sb_icon.png b/src/assets/images/order/sb_icon.png new file mode 100644 index 0000000..c51fc26 --- /dev/null +++ b/src/assets/images/order/sb_icon.png Binary files differ diff --git a/src/assets/images/order/sl_icon.png b/src/assets/images/order/sl_icon.png new file mode 100644 index 0000000..c76998f --- /dev/null +++ b/src/assets/images/order/sl_icon.png Binary files differ diff --git a/src/assets/images/order/tj_icon.png b/src/assets/images/order/tj_icon.png new file mode 100644 index 0000000..207746b --- /dev/null +++ b/src/assets/images/order/tj_icon.png Binary files differ diff --git a/src/assets/images/order/xy_icon.png b/src/assets/images/order/xy_icon.png new file mode 100644 index 0000000..71c6d9b --- /dev/null +++ b/src/assets/images/order/xy_icon.png Binary files differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 6ac8c83..0d7567e 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -135,7 +135,7 @@ padding: 20px; } -.publicContainer{ +.publicContainer { padding: 20px; } @@ -161,11 +161,13 @@ text-align: right; padding-right: 20px; transition: 600ms ease position; - background: linear-gradient(90deg, - rgba(32, 182, 249, 1) 0%, - rgba(32, 182, 249, 1) 0%, - rgba(33, 120, 241, 1) 100%, - rgba(33, 120, 241, 1) 100%); + background: linear-gradient( + 90deg, + rgba(32, 182, 249, 1) 0%, + rgba(32, 182, 249, 1) 0%, + rgba(33, 120, 241, 1) 100%, + rgba(33, 120, 241, 1) 100% + ); .subtitle { font-size: 20px; @@ -221,4 +223,10 @@ margin-right: 15px; cursor: pointer; } -} \ No newline at end of file +} + +// .pagingPosition { +// position: absolute !important; +// right: 0px; +// bottom: 0px; +// } diff --git a/src/directive/common/setHeight.js b/src/directive/common/setHeight.js new file mode 100644 index 0000000..61bebd7 --- /dev/null +++ b/src/directive/common/setHeight.js @@ -0,0 +1,25 @@ +export default { + mounted: (el, binding) => { + el.resizeListener = () => { + setHeight(el, binding); + }; + + setHeight(el, binding); + window.addEventListener("resize", el.resizeListener); + }, + unmounted(el) { + window.removeEventListener("resize", el.resizeListener); + }, + updated(el, binding) { + setHeight(el, binding); + }, +}; + +function setHeight(el, binding) { + // const top = el.offsetTop; + const top = el.getBoundingClientRect().top; + const bottom = binding?.value?.bottom || 84; + const pageHeight = window.innerHeight; + el.style.height = pageHeight - top - bottom + "px"; + // el.style.overflowY = "auto"; +} diff --git a/src/directive/index.js b/src/directive/index.js index a6e88a1..7fec6ff 100644 --- a/src/directive/index.js +++ b/src/directive/index.js @@ -4,6 +4,7 @@ import divDrag from "./el-drag-div"; import dialogDrag from "./el-drag-dialog"; import divDownLoad from "./el-downLoad"; +import setHeight from './common/setHeight'; export default function directive(app) { app.directive("hasRole", hasRole); app.directive("hasPermi", hasPermi); @@ -11,4 +12,5 @@ app.directive("divDrag", divDrag); app.directive("dialogDrag", dialogDrag); app.directive("divDownLoad", divDownLoad); + app.directive('setHeight', setHeight); } diff --git a/src/views/order/workOrderProcessing/components/checkOrder.vue b/src/views/order/workOrderProcessing/components/checkOrder.vue new file mode 100644 index 0000000..e8ae6e5 --- /dev/null +++ b/src/views/order/workOrderProcessing/components/checkOrder.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/assets/images/order/fp_icon.png b/src/assets/images/order/fp_icon.png new file mode 100644 index 0000000..b21e5d2 --- /dev/null +++ b/src/assets/images/order/fp_icon.png Binary files differ diff --git a/src/assets/images/order/gdbg_img.png b/src/assets/images/order/gdbg_img.png new file mode 100644 index 0000000..9760166 --- /dev/null +++ b/src/assets/images/order/gdbg_img.png Binary files differ diff --git a/src/assets/images/order/gddj_icon.png b/src/assets/images/order/gddj_icon.png new file mode 100644 index 0000000..964c4b1 --- /dev/null +++ b/src/assets/images/order/gddj_icon.png Binary files differ diff --git a/src/assets/images/order/hs_icon.png b/src/assets/images/order/hs_icon.png new file mode 100644 index 0000000..c29fb66 --- /dev/null +++ b/src/assets/images/order/hs_icon.png Binary files differ diff --git a/src/assets/images/order/ja_icon.png b/src/assets/images/order/ja_icon.png new file mode 100644 index 0000000..776fd3e --- /dev/null +++ b/src/assets/images/order/ja_icon.png Binary files differ diff --git a/src/assets/images/order/sb_icon.png b/src/assets/images/order/sb_icon.png new file mode 100644 index 0000000..c51fc26 --- /dev/null +++ b/src/assets/images/order/sb_icon.png Binary files differ diff --git a/src/assets/images/order/sl_icon.png b/src/assets/images/order/sl_icon.png new file mode 100644 index 0000000..c76998f --- /dev/null +++ b/src/assets/images/order/sl_icon.png Binary files differ diff --git a/src/assets/images/order/tj_icon.png b/src/assets/images/order/tj_icon.png new file mode 100644 index 0000000..207746b --- /dev/null +++ b/src/assets/images/order/tj_icon.png Binary files differ diff --git a/src/assets/images/order/xy_icon.png b/src/assets/images/order/xy_icon.png new file mode 100644 index 0000000..71c6d9b --- /dev/null +++ b/src/assets/images/order/xy_icon.png Binary files differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 6ac8c83..0d7567e 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -135,7 +135,7 @@ padding: 20px; } -.publicContainer{ +.publicContainer { padding: 20px; } @@ -161,11 +161,13 @@ text-align: right; padding-right: 20px; transition: 600ms ease position; - background: linear-gradient(90deg, - rgba(32, 182, 249, 1) 0%, - rgba(32, 182, 249, 1) 0%, - rgba(33, 120, 241, 1) 100%, - rgba(33, 120, 241, 1) 100%); + background: linear-gradient( + 90deg, + rgba(32, 182, 249, 1) 0%, + rgba(32, 182, 249, 1) 0%, + rgba(33, 120, 241, 1) 100%, + rgba(33, 120, 241, 1) 100% + ); .subtitle { font-size: 20px; @@ -221,4 +223,10 @@ margin-right: 15px; cursor: pointer; } -} \ No newline at end of file +} + +// .pagingPosition { +// position: absolute !important; +// right: 0px; +// bottom: 0px; +// } diff --git a/src/directive/common/setHeight.js b/src/directive/common/setHeight.js new file mode 100644 index 0000000..61bebd7 --- /dev/null +++ b/src/directive/common/setHeight.js @@ -0,0 +1,25 @@ +export default { + mounted: (el, binding) => { + el.resizeListener = () => { + setHeight(el, binding); + }; + + setHeight(el, binding); + window.addEventListener("resize", el.resizeListener); + }, + unmounted(el) { + window.removeEventListener("resize", el.resizeListener); + }, + updated(el, binding) { + setHeight(el, binding); + }, +}; + +function setHeight(el, binding) { + // const top = el.offsetTop; + const top = el.getBoundingClientRect().top; + const bottom = binding?.value?.bottom || 84; + const pageHeight = window.innerHeight; + el.style.height = pageHeight - top - bottom + "px"; + // el.style.overflowY = "auto"; +} diff --git a/src/directive/index.js b/src/directive/index.js index a6e88a1..7fec6ff 100644 --- a/src/directive/index.js +++ b/src/directive/index.js @@ -4,6 +4,7 @@ import divDrag from "./el-drag-div"; import dialogDrag from "./el-drag-dialog"; import divDownLoad from "./el-downLoad"; +import setHeight from './common/setHeight'; export default function directive(app) { app.directive("hasRole", hasRole); app.directive("hasPermi", hasPermi); @@ -11,4 +12,5 @@ app.directive("divDrag", divDrag); app.directive("dialogDrag", dialogDrag); app.directive("divDownLoad", divDownLoad); + app.directive('setHeight', setHeight); } diff --git a/src/views/order/workOrderProcessing/components/checkOrder.vue b/src/views/order/workOrderProcessing/components/checkOrder.vue new file mode 100644 index 0000000..e8ae6e5 --- /dev/null +++ b/src/views/order/workOrderProcessing/components/checkOrder.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/order/workOrderProcessing/components/registerOrder.vue b/src/views/order/workOrderProcessing/components/registerOrder.vue new file mode 100644 index 0000000..85d5d7e --- /dev/null +++ b/src/views/order/workOrderProcessing/components/registerOrder.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/src/assets/images/order/fp_icon.png b/src/assets/images/order/fp_icon.png new file mode 100644 index 0000000..b21e5d2 --- /dev/null +++ b/src/assets/images/order/fp_icon.png Binary files differ diff --git a/src/assets/images/order/gdbg_img.png b/src/assets/images/order/gdbg_img.png new file mode 100644 index 0000000..9760166 --- /dev/null +++ b/src/assets/images/order/gdbg_img.png Binary files differ diff --git a/src/assets/images/order/gddj_icon.png b/src/assets/images/order/gddj_icon.png new file mode 100644 index 0000000..964c4b1 --- /dev/null +++ b/src/assets/images/order/gddj_icon.png Binary files differ diff --git a/src/assets/images/order/hs_icon.png b/src/assets/images/order/hs_icon.png new file mode 100644 index 0000000..c29fb66 --- /dev/null +++ b/src/assets/images/order/hs_icon.png Binary files differ diff --git a/src/assets/images/order/ja_icon.png b/src/assets/images/order/ja_icon.png new file mode 100644 index 0000000..776fd3e --- /dev/null +++ b/src/assets/images/order/ja_icon.png Binary files differ diff --git a/src/assets/images/order/sb_icon.png b/src/assets/images/order/sb_icon.png new file mode 100644 index 0000000..c51fc26 --- /dev/null +++ b/src/assets/images/order/sb_icon.png Binary files differ diff --git a/src/assets/images/order/sl_icon.png b/src/assets/images/order/sl_icon.png new file mode 100644 index 0000000..c76998f --- /dev/null +++ b/src/assets/images/order/sl_icon.png Binary files differ diff --git a/src/assets/images/order/tj_icon.png b/src/assets/images/order/tj_icon.png new file mode 100644 index 0000000..207746b --- /dev/null +++ b/src/assets/images/order/tj_icon.png Binary files differ diff --git a/src/assets/images/order/xy_icon.png b/src/assets/images/order/xy_icon.png new file mode 100644 index 0000000..71c6d9b --- /dev/null +++ b/src/assets/images/order/xy_icon.png Binary files differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 6ac8c83..0d7567e 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -135,7 +135,7 @@ padding: 20px; } -.publicContainer{ +.publicContainer { padding: 20px; } @@ -161,11 +161,13 @@ text-align: right; padding-right: 20px; transition: 600ms ease position; - background: linear-gradient(90deg, - rgba(32, 182, 249, 1) 0%, - rgba(32, 182, 249, 1) 0%, - rgba(33, 120, 241, 1) 100%, - rgba(33, 120, 241, 1) 100%); + background: linear-gradient( + 90deg, + rgba(32, 182, 249, 1) 0%, + rgba(32, 182, 249, 1) 0%, + rgba(33, 120, 241, 1) 100%, + rgba(33, 120, 241, 1) 100% + ); .subtitle { font-size: 20px; @@ -221,4 +223,10 @@ margin-right: 15px; cursor: pointer; } -} \ No newline at end of file +} + +// .pagingPosition { +// position: absolute !important; +// right: 0px; +// bottom: 0px; +// } diff --git a/src/directive/common/setHeight.js b/src/directive/common/setHeight.js new file mode 100644 index 0000000..61bebd7 --- /dev/null +++ b/src/directive/common/setHeight.js @@ -0,0 +1,25 @@ +export default { + mounted: (el, binding) => { + el.resizeListener = () => { + setHeight(el, binding); + }; + + setHeight(el, binding); + window.addEventListener("resize", el.resizeListener); + }, + unmounted(el) { + window.removeEventListener("resize", el.resizeListener); + }, + updated(el, binding) { + setHeight(el, binding); + }, +}; + +function setHeight(el, binding) { + // const top = el.offsetTop; + const top = el.getBoundingClientRect().top; + const bottom = binding?.value?.bottom || 84; + const pageHeight = window.innerHeight; + el.style.height = pageHeight - top - bottom + "px"; + // el.style.overflowY = "auto"; +} diff --git a/src/directive/index.js b/src/directive/index.js index a6e88a1..7fec6ff 100644 --- a/src/directive/index.js +++ b/src/directive/index.js @@ -4,6 +4,7 @@ import divDrag from "./el-drag-div"; import dialogDrag from "./el-drag-dialog"; import divDownLoad from "./el-downLoad"; +import setHeight from './common/setHeight'; export default function directive(app) { app.directive("hasRole", hasRole); app.directive("hasPermi", hasPermi); @@ -11,4 +12,5 @@ app.directive("divDrag", divDrag); app.directive("dialogDrag", dialogDrag); app.directive("divDownLoad", divDownLoad); + app.directive('setHeight', setHeight); } diff --git a/src/views/order/workOrderProcessing/components/checkOrder.vue b/src/views/order/workOrderProcessing/components/checkOrder.vue new file mode 100644 index 0000000..e8ae6e5 --- /dev/null +++ b/src/views/order/workOrderProcessing/components/checkOrder.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/order/workOrderProcessing/components/registerOrder.vue b/src/views/order/workOrderProcessing/components/registerOrder.vue new file mode 100644 index 0000000..85d5d7e --- /dev/null +++ b/src/views/order/workOrderProcessing/components/registerOrder.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/src/views/order/workOrderProcessing/index.vue b/src/views/order/workOrderProcessing/index.vue index ac8bcc4..d3ea500 100644 --- a/src/views/order/workOrderProcessing/index.vue +++ b/src/views/order/workOrderProcessing/index.vue @@ -1,139 +1,93 @@ diff --git a/src/views/order/workOrderProcessing/components/registerOrder.vue b/src/views/order/workOrderProcessing/components/registerOrder.vue new file mode 100644 index 0000000..85d5d7e --- /dev/null +++ b/src/views/order/workOrderProcessing/components/registerOrder.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/src/views/order/workOrderProcessing/index.vue b/src/views/order/workOrderProcessing/index.vue index ac8bcc4..d3ea500 100644 --- a/src/views/order/workOrderProcessing/index.vue +++ b/src/views/order/workOrderProcessing/index.vue @@ -1,139 +1,93 @@