단속자료검사, 답변미리보기, 통합조회 스크립트 로딩 방식 변경

main
이범준 10 months ago
parent eaab0da56d
commit 234091bca1

@ -70,7 +70,6 @@ public class Crdn02Controller extends ApplicationController {
ModelAndView mav = new ModelAndView(); ModelAndView mav = new ModelAndView();
mav.setViewName("fims/crdn/crdn02010-main"); mav.setViewName("fims/crdn/crdn02010-main");
mav.addObject("pageName", "crdn02010"); mav.addObject("pageName", "crdn02010");
mav.addObject("module", "type='module'");
Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM002", "FIM003", "FIM010", "FIM026","FIM054"); Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM002", "FIM003", "FIM010", "FIM026","FIM054");
mav.addObject("FIM002List", commonCodes.get("FIM002")); mav.addObject("FIM002List", commonCodes.get("FIM002"));

@ -56,7 +56,6 @@ public class Cvlc05Controller extends ApplicationController {
ModelAndView mav = new ModelAndView(); ModelAndView mav = new ModelAndView();
mav.setViewName("fims/cvlc/cvlc05010-main"); mav.setViewName("fims/cvlc/cvlc05010-main");
mav.addObject("pageName", "cvlc05010"); mav.addObject("pageName", "cvlc05010");
mav.addObject("module", "type='module'");
mav.addObject("currentUserName", UserInfo.current().getName()); mav.addObject("currentUserName", UserInfo.current().getName());
ManagedUser currentUser = userMapper.getUser(UserInfo.current().getAccount(), UserInfo.current().getInstitute()); ManagedUser currentUser = userMapper.getUser(UserInfo.current().getAccount(), UserInfo.current().getInstitute());

@ -154,7 +154,6 @@ public class Sprt01Controller extends ApplicationController {
mav.addObject("fastSearch", "null"); mav.addObject("fastSearch", "null");
} }
mav.addObject("module", "type='module'");
return mav; return mav;
} }

@ -371,9 +371,9 @@
<div class="content-backdrop fade"></div> <div class="content-backdrop fade"></div>
</div> </div>
<script type="module" src="<c:url value='/resources/js/fims/crdn/inspection.js?${ver}'/>"></script> <script>
<script ${module}> LoadScript("inspectionScript","/resources/js/fims/crdn/inspection.js");
import {InspectionControl, fnMakeImgTag} from "<c:url value='/resources/js/fims/crdn/inspection.js?${ver}'/>";
/************************************************************************** /**************************************************************************
* Global Variable * Global Variable
**************************************************************************/ **************************************************************************/
@ -708,11 +708,11 @@ $(document).ready(function(){
$("#nextDataFiles--${pageName}").html(""); $("#nextDataFiles--${pageName}").html("");
currentDataFileList.forEach(function(item, index, array){ currentDataFileList.forEach(function(item, index, array){
var output = fnMakeImgTag(item.URL, item.FILE_NM,"cur"+item.FILE_ID+'${pageName}',item.MOSAIC); var output = fnMakeImgTagForInspection(item.URL, item.FILE_NM,"cur"+item.FILE_ID+'${pageName}',item.MOSAIC);
$("#curDataFiles--${pageName}").append(output); $("#curDataFiles--${pageName}").append(output);
}); });
nextDataFileList.forEach(function(item, index, array){ nextDataFileList.forEach(function(item, index, array){
var output = fnMakeImgTag(item.URL, item.FILE_NM,"next"+item.FILE_ID+'${pageName}',item.MOSAIC); var output = fnMakeImgTagForInspection(item.URL, item.FILE_NM,"next"+item.FILE_ID+'${pageName}',item.MOSAIC);
$("#nextDataFiles--${pageName}").append(output); $("#nextDataFiles--${pageName}").append(output);
}); });

@ -307,15 +307,8 @@
</form> </form>
</template> </template>
<script type="module" src="<c:url value='/resources/js/fims/cvlc/answerWords.js?${ver}'/>"></script> <script>
<script ${module}> LoadScript("answerWordsScript","/resources/js/fims/cvlc/answerWords.js");
import {
AnswerBodyControl,
MACRO_STRING,
fnMacroStringInsert,
fnMacroWordsReplace
} from "<c:url value='/resources/js/fims/cvlc/answerWords.js?${ver}'/>";
/************************************************************************** /**************************************************************************
* Global Variable * Global Variable
**************************************************************************/ **************************************************************************/

@ -27,10 +27,9 @@
<span id="tempArea--${pageName}" hidden></span> <span id="tempArea--${pageName}" hidden></span>
<script type="module" <script>
src="<c:url value='/resources/js/fims/sprt/integrationSearch.js?${ver}'/>"></script>
<script ${module}> LoadScript("integrationSearchScript","/resources/js/fims/sprt/integrationSearch.js");
import { IntegrationSearchControl } from "<c:url value='/resources/js/fims/sprt/integrationSearch.js?${ver}'/>";
/************************************************************************** /**************************************************************************
* Global Variable * Global Variable
**************************************************************************/ **************************************************************************/

@ -1,4 +1,4 @@
export class InspectionControl { class InspectionControl {
constructor(mainConf, subConf) { constructor(mainConf, subConf) {
this.main = new DatasetControl(mainConf); this.main = new DatasetControl(mainConf);
this.sub = new DatasetControl(subConf); this.sub = new DatasetControl(subConf);
@ -6,7 +6,7 @@ export class InspectionControl {
} }
export function fnMakeImgTag(url, title, crdnPhotoId, mosaic) { function fnMakeImgTagForInspection(url, title, crdnPhotoId, mosaic) {
return `<div style="display:flex;min-width:300px;"> return `<div style="display:flex;min-width:300px;">
<div style="position:relative"> <div style="position:relative">

@ -1,4 +1,4 @@
export class AnswerBodyControl { class AnswerBodyControl {
constructor(levyCaseConf, warningCaseConf, nonlevyCaseConf) { constructor(levyCaseConf, warningCaseConf, nonlevyCaseConf) {
this.levy = new DatasetControl(levyCaseConf); this.levy = new DatasetControl(levyCaseConf);
this.warning = new DatasetControl(warningCaseConf); this.warning = new DatasetControl(warningCaseConf);
@ -6,13 +6,13 @@ export class AnswerBodyControl {
} }
} }
export const MACRO_STRING = { const MACRO_STRING = {
MACRO_SEQ : "[@일련번호]", MACRO_SEQ : "[@일련번호]",
MACRO_TELNO : "[@전화번호]", MACRO_TELNO : "[@전화번호]",
MACRO_PIC_NM : "[@담당자성명]" MACRO_PIC_NM : "[@담당자성명]"
}; };
export function fnMacroStringInsert(objId, addText) { function fnMacroStringInsert(objId, addText) {
var insertObj = document.getElementById(objId); var insertObj = document.getElementById(objId);
var textVal = insertObj.value; var textVal = insertObj.value;
var setPosition = insertObj.selectionStart; var setPosition = insertObj.selectionStart;
@ -25,7 +25,7 @@ export function fnMacroStringInsert(objId, addText) {
insertObj.focus(); insertObj.focus();
} }
export function fnMacroWordsReplace(header, footer, body, telno, picNm) { function fnMacroWordsReplace(header, footer, body, telno, picNm) {
var result = header + "\n\n" + body + "\n\n" + footer; var result = header + "\n\n" + body + "\n\n" + footer;
result = result.replaceAll("", "@"); result = result.replaceAll("", "@");

@ -1,4 +1,4 @@
export class IntegrationSearchControl extends DatasetControl { class IntegrationSearchControl extends DatasetControl {
constructor(conf) { constructor(conf) {
super(conf); super(conf);

Loading…
Cancel
Save