diff --git a/.idea/sonarlint/issuestore/0/0/004d4ff0ac1c4ee71d59718dd294cb9c9cf54327 b/.idea/sonarlint/issuestore/0/0/004d4ff0ac1c4ee71d59718dd294cb9c9cf54327 index e69de29..dbfe399 100644 --- a/.idea/sonarlint/issuestore/0/0/004d4ff0ac1c4ee71d59718dd294cb9c9cf54327 +++ b/.idea/sonarlint/issuestore/0/0/004d4ff0ac1c4ee71d59718dd294cb9c9cf54327 @@ -0,0 +1,9 @@ + +ojavascript:S1186 +"&Unexpected empty method 'getMainList'.(‹8Ӈ1J$07821aa0-a571-4d50-9bfa-f6b4d6195c08 +jjavascript:S1186 "!Unexpected empty method 'addRow'.(8Ӈ1J$09d0350f-4c9b-4d60-86cd-7953270ea714 +kjavascript:S1186 ""Unexpected empty method 'putData'.(炜8Ӈ1J$799adff7-9390-4301-a9a9-f6b008a71c69 +tjavascript:S3796"*Add a "return" statement to this callback.(꘻8Ӈ1J$9f7cdd6e-48b7-418a-9930-5cde33393241 +javascript:S6644">Unnecessary use of boolean literals in conditional expression.(8Ӈ1J$a8d65cab-e9d3-425c-8ddd-24aaa5cdcf3e +Sjavascript:S3796"*Add a "return" statement to this callback.(81 +gjavascript:S6644">Unnecessary use of boolean literals in conditional expression.(81 \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/1/1/110cb7aeee57421d3d58166bbab7f9486ae18297 b/.idea/sonarlint/issuestore/1/1/110cb7aeee57421d3d58166bbab7f9486ae18297 index e69de29..881fbd4 100644 --- a/.idea/sonarlint/issuestore/1/1/110cb7aeee57421d3d58166bbab7f9486ae18297 +++ b/.idea/sonarlint/issuestore/1/1/110cb7aeee57421d3d58166bbab7f9486ae18297 @@ -0,0 +1,18 @@ + +javascript:S33589"DExtract this nested ternary operation into an independent statement.(81J$188edc6f-efa9-480e-9720-9afaf75888a4 +javascript:S3358:"DExtract this nested ternary operation into an independent statement.(꜄81J$a9fcadfa-2589-4e8f-a7e1-b53c3a10bbc2 +zjavascript:S1854O"2Remove this useless assignment to variable "sord".(ֳO81J$6a1e5773-421c-46fb-b7b4-2d10d2c3a3d4 +javascript:S3358T"DExtract this nested ternary operation into an independent statement.(81J$bbbfac2b-e556-44fa-8717-54f695538d26 +javascript:S3358U"DExtract this nested ternary operation into an independent statement.(81J$2df921bd-981f-4857-8287-7d9392b53223 +javascript:S101["URename class "Tb_basecode_class" to match the regular expression ^[A-Z][a-zA-Z0-9]*$.(81J$dcb1db2a-68af-4d1b-8542-0518b29dd1e8 +ljavascript:S125c"Remove this commented out code.(Ӣ81J$30c53a42-df7a-451f-b6cf-ed99a7a4bd1d +gjavascript:S125"Remove this commented out code.(%81J$54223af7-f6a1-4d4a-8082-b9497e815008 +mjavascript:S125"Remove this commented out code.(Ը81J$cf9d0376-cbea-452d-83fe-ffc8e3398aef +mjavascript:S125"Remove this commented out code.(Ԇ81J$79e2a5cb-3523-4cfe-9a5f-62fcdfce0df3 +njavascript:S1186"$Unexpected empty method 'setFilter'.(˾81J$87547af4-8ac7-497c-a3f0-3a3ce1133142 +mjavascript:S125"Remove this commented out code.(ߴ–81J$68cd4f77-5426-4083-9627-834c63500a22 +mjavascript:S125"Remove this commented out code.(81J$3af6774e-49a5-45f4-8f3b-b74638951037 +hjavascript:S125"Remove this commented out code.(81J$632d44f1-0366-46ed-ba85-6b0e0c641eab +hjavascript:S125"Remove this commented out code.(81J$3bae4d9f-eb81-4c5d-a588-cfd4e1282f34 +hjavascript:S125"Remove this commented out code.(81J$a3c2b64e-7587-4eb0-92e1-fcc5633dd08f +mjavascript:S125"Remove this commented out code.(81J$cb1c59d6-73c5-409b-a229-adf3845134ca \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/5/8/58148cfe2010d0b3f3833f6052a2dc4babe21d29 b/.idea/sonarlint/issuestore/5/8/58148cfe2010d0b3f3833f6052a2dc4babe21d29 index a26f03d..0eb1235 100644 --- a/.idea/sonarlint/issuestore/5/8/58148cfe2010d0b3f3833f6052a2dc4babe21d29 +++ b/.idea/sonarlint/issuestore/5/8/58148cfe2010d0b3f3833f6052a2dc4babe21d29 @@ -1,21 +1,21 @@ -javascript:S101"QRename class "Tb_oper_class" to match the regular expression ^[A-Z][a-zA-Z0-9]*$.(81J$94226818-c44e-40a2-bd67-b031843406bb -jjavascript:S11863"!Unexpected empty method 'addRow'.(ٲ81J$ac7fc8b1-ef90-4972-94e6-6f3b3b217223 -mjavascript:S1186<"$Unexpected empty method 'removeRow'.(Ӂ81J$efec0fdf-d9c1-4d73-a6c0-a579012fff21 -rjavascript:S1186P"$Unexpected empty method 'cellClick'.(81J$f4d7f7ce-205c-40e6-8b77-a94bc6f9eabb -ljavascript:S125Y"Remove this commented out code.(Е81J$585c5593-7865-47a3-9e48-ba0a69b77e7c -gjavascript:S125q"Remove this commented out code.(81J$35c42a2a-b281-4594-b53a-2bc4e670a576 -hjavascript:S125"Remove this commented out code.(ٳ81J$0c9cb420-2131-462b-90a8-71c3d4e45c27 -hjavascript:S125"Remove this commented out code.(81J$8bdb0f8d-e72b-40af-b438-74ee201b826e -hjavascript:S125"Remove this commented out code.(81J$88032d99-72c9-4375-a1a6-2ca103e996c0 -javascript:S4138"LExpected a `for-of` loop instead of a `for` loop with this simple iteration.(Ʋ81J$f062605b-4b6b-46d1-8b46-f7b9b641bf72 -javascript:S2703"cAdd the "let", "const" or "var" keyword to this declaration of "finalDataList" to make it explicit.(881J$99673c79-eaa4-4839-8625-9b2306c9427d -javascript:S101"RRename class "Tb_order_class" to match the regular expression ^[A-Z][a-zA-Z0-9]*$.(ԙ81J$98eaa811-4d12-457c-8fbe-41f508f7fa13 -kjavascript:S1186"!Unexpected empty method 'addRow'.(ٲ81J$67a4eb18-9c06-44b4-916d-b0869c79aa4a -njavascript:S1186"$Unexpected empty method 'removeRow'.(Ӂ81J$ce8927ef-89ec-4816-8738-b424c4925059 -sjavascript:S1186"$Unexpected empty method 'cellClick'.(81J$90f4a8ad-3025-465f-8ddf-48ad145a4c94 -mjavascript:S125"Remove this commented out code.(Е81J$169710e7-aa74-457b-8d6f-715fa7066a1d -hjavascript:S125"Remove this commented out code.(81J$12b340bc-8d65-44db-811e-8668e07f3d31 -hjavascript:S125"Remove this commented out code.(ך81J$af26df5f-fbc9-4971-a8dd-d6c8805b16fb -hjavascript:S125"Remove this commented out code.(81J$ba3f2e6c-d0b5-4b4c-8f1b-766800e5b542 -hjavascript:S125"Remove this commented out code.(81J$3c153842-781b-4b8e-b9a2-519c6869096d \ No newline at end of file +javascript:S101"QRename class "Tb_oper_class" to match the regular expression ^[A-Z][a-zA-Z0-9]*$.(81J$f62185ea-20c8-4e8b-9121-209d4daca5c8 +jjavascript:S11862"!Unexpected empty method 'addRow'.(ٲ81J$874f2bfa-cd07-4783-b6b9-9323d3f57233 +mjavascript:S1186;"$Unexpected empty method 'removeRow'.(Ӂ81J$94cd77b5-d262-4038-808a-835285e9469d +rjavascript:S1186O"$Unexpected empty method 'cellClick'.(81J$5381f3ba-9a27-4a36-b473-6fbe7040d5ec +ljavascript:S125X"Remove this commented out code.(Е81J$6b9ae1de-5f6f-4878-80c1-240f7b44aedf +gjavascript:S125p"Remove this commented out code.(81J$76ffe8bc-17c0-4e56-97a3-3c1c4e1373d6 +hjavascript:S125"Remove this commented out code.(ٳ81J$d741b39a-a278-49c7-b296-e4cfbdd31e8e +hjavascript:S125"Remove this commented out code.(81J$18ca6bf3-0c33-4d9e-9871-4b607d29898b +hjavascript:S125"Remove this commented out code.(81J$9fa15e87-f163-48a3-b8de-dfb06575605a +javascript:S4138"LExpected a `for-of` loop instead of a `for` loop with this simple iteration.(Ʋ81J$d4d29b9f-38d4-4d60-9d71-1a012ae3fea1 +javascript:S2703"cAdd the "let", "const" or "var" keyword to this declaration of "finalDataList" to make it explicit.(881J$4db9f712-ef41-419b-80f2-e7b7b23bd8e9 +javascript:S101"RRename class "Tb_order_class" to match the regular expression ^[A-Z][a-zA-Z0-9]*$.(ԙ81J$a4febe6f-e361-4d33-a9ab-0346a85d2e6b +kjavascript:S1186"!Unexpected empty method 'addRow'.(ٲ81J$a3015435-7fe4-40d6-95ca-eca5f3ee6126 +njavascript:S1186"$Unexpected empty method 'removeRow'.(Ӂ81J$beceeadf-22cc-45ae-b19d-5788d6ea0b95 +sjavascript:S1186"$Unexpected empty method 'cellClick'.(81J$34e0681e-8e8a-42c0-aef0-79c03fa027b0 +mjavascript:S125"Remove this commented out code.(Е81J$1c093d90-0f25-46b3-97e8-48b2ba498ead +hjavascript:S125"Remove this commented out code.(81J$8f724bb8-1c48-46d6-bca5-3b8917f5dc54 +hjavascript:S125"Remove this commented out code.(ך81J$3b751fd6-95b1-4a32-8306-d23debf233cd +hjavascript:S125"Remove this commented out code.(81J$76fb7176-9e86-4f1a-b866-13f943382a8b +hjavascript:S125"Remove this commented out code.(81J$16386661-e1b5-4360-9fa9-e0b539ba832f \ No newline at end of file diff --git a/home_dir/lib/globals_inc.php b/home_dir/lib/globals_inc.php index 59f3623..19c97f1 100644 --- a/home_dir/lib/globals_inc.php +++ b/home_dir/lib/globals_inc.php @@ -236,7 +236,8 @@ $GLOBALS['_IO_TYPE_FIN'] = $GLOBALS['_ALL_BASE']['CODE']['IO_TYPE_FIN'] ?: $GLOBALS['_NCR_CD'] = $GLOBALS['_ALL_BASE']['CODE']['NCR_CD'] ?: $GLOBALS['_NCR_CD']; $GLOBALS['_TASK_TYPE'] = $GLOBALS['_ALL_BASE']['CODE']['TASK_TYPE'] ?: $GLOBALS['_TASK_TYPE']; $GLOBALS['_STOP_CD'] = $GLOBALS['_ALL_BASE']['CODE']['STOP_CD'] ?: $GLOBALS['_STOP_CD']; -$GLOBALS['_DEF_CD'] = $GLOBALS['_ALL_BASE']['CODE']['DEF_CD'] ?: $GLOBALS['_DEF_CD']; +$GLOBALS['_DEF_CD'] = $GLOBALS['_ALL_BASE']['CODE']['DEF_CD'] ?: $GLOBALS['_DEF_CD']; +$GLOBALS['_RSLT_GRP'] = $GLOBALS['_ALL_BASE']['CODE']['RSLT_GRP'] ?: $GLOBALS['_RSLT_GRP']; // sort($GLOBALS['_varsNations']); // ksort($GLOBALS['_varsCurrency']); diff --git a/home_dir/www/ksvc/base/basecode/basecode.js b/home_dir/www/ksvc/base/basecode/basecode.js index 6665543..4991c9e 100644 --- a/home_dir/www/ksvc/base/basecode/basecode.js +++ b/home_dir/www/ksvc/base/basecode/basecode.js @@ -1,7 +1,7 @@ /* * @Overview 기초 코드 관리 */ - +console.log("asdf"); const VueBaseCode = createApp({ data() { return { diff --git a/home_dir/www/ksvc/inc/js/vars.js.php b/home_dir/www/ksvc/inc/js/vars.js.php index ef33472..c2ed344 100644 --- a/home_dir/www/ksvc/inc/js/vars.js.php +++ b/home_dir/www/ksvc/inc/js/vars.js.php @@ -42,5 +42,6 @@ const varsTLColor = ; const varsIO_TYPE_FIN = ; const varsNCR_CD = ; const varsTASK_TYPE = ; -const varsSTOP_CD = ; -const varsDEF_CD = ; \ No newline at end of file +const varsSTOP_CD = ; +const varsDEF_CD = ; +const varsRSLT_GRP = ; \ No newline at end of file diff --git a/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.js b/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.js index e13b92c..dd1da0a 100644 --- a/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.js +++ b/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.js @@ -405,6 +405,11 @@ class Tb_order_class { field: "CODE_VAL", title: "실적 그룹", width: 80, + cssClass: "user-list editable-cell", + editor: "list", + editorParams: { values: varsRSLT_GRP }, + formatter: tb_common_funtions.formatterSelect, + formatterParams:{ values : varsRSLT_GRP }, }, { field: "EMP_NM", title: "작업자", width: 100 ,cssClass: "editable-cell"}, diff --git a/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.js b/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.js index d5338e8..f1403d9 100644 --- a/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.js +++ b/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.js @@ -115,10 +115,10 @@ class FieldPop { ], isFacility : [ { field: "", formatter:"rownum", title: "순번", width: 50}, - { field: "", title: "설비코드", minWidth: 100, width:'16%'}, - { field: "", title: "설비명", minWidth: 150, width:'22%'}, - { field: "", title: "소속", minWidth: 80, width:'15%'}, - { field: "", title: "상태", minWidth: 80, width:'15%'}, + { field: "", title: "설비코드", minWidth: 80, width:'14%'}, + { field: "", title: "설비명", minWidth: 150, width:'26%'}, + { field: "", title: "소속", minWidth: 80, width:'14%'}, + { field: "", title: "상태", minWidth: 80, width:'14%'}, { field: "", title: "가동
시작시간", minWidth: 120, width:'23%'} ], isFacltBreak : [ @@ -223,6 +223,12 @@ class FieldPop { this.isComponent[key] = com == key ? true : false; }); + if(com=='isInsp'){ + this.isTab = { + isInsp: true, + isFile: false + } + }; this.callTable(com); }, diff --git a/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.php b/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.php index 6264a11..7fd0708 100644 --- a/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.php +++ b/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.php @@ -508,7 +508,7 @@ include_once "{$_SERVER['DOCUMENT_ROOT']}/common.inc.php"; -
+
@@ -520,7 +520,7 @@ include_once "{$_SERVER['DOCUMENT_ROOT']}/common.inc.php";
- +
@@ -551,45 +551,26 @@ include_once "{$_SERVER['DOCUMENT_ROOT']}/common.inc.php";
-
+
-
+
- -
+
+
-
- -
- - +
+ + 선택 확인
-
- - +
+ + 선택 취소
- -
-
- -
- - 선택 확인 -
-
- - 선택 취소 -
- -
-
-
-
diff --git a/home_dir/www/ksvc/site/sts_order_prod/sts_order_prod.js b/home_dir/www/ksvc/site/sts_order_prod/sts_order_prod.js index 48eebb8..172a879 100644 --- a/home_dir/www/ksvc/site/sts_order_prod/sts_order_prod.js +++ b/home_dir/www/ksvc/site/sts_order_prod/sts_order_prod.js @@ -2,7 +2,6 @@ * @Overview 생산오더 별 진행 현황 */ -console.log("hihihihihihihi this is hihi!!!"); class Tb_oper_class { constructor(container){