From 0651b8eff36f4dc670c5112477cdc674153eb689 Mon Sep 17 00:00:00 2001 From: kkw29 Date: Thu, 15 Jun 2023 11:27:51 +0900 Subject: [PATCH] =?UTF-8?q?html=20=ED=8C=8C=EC=9D=BC=20=EC=A0=84=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MonitoringConversationMarkController.java | 6 +++ .../resources/static/aajs/conversationMark.js | 2 + .../resources/static/aajs/intentAnalysis.js | 2 + ...ntentExample.jsp => addIntentExample.html} | 6 +-- .../{consulting.jsp => consulting.html} | 26 +------------ ...ersationMark.jsp => conversationMark.html} | 31 +--------------- ...intentAnalysis.jsp => intentAnalysis.html} | 29 +-------------- .../{outscenario.jsp => outscenario.html} | 37 +------------------ .../statistics/call/{info.jsp => info.html} | 26 +------------ .../statistics/intent/{day.jsp => day.html} | 16 -------- .../statistics/intent/{item.jsp => item.html} | 26 +------------ .../statistics/scenario/{day.jsp => day.html} | 26 +------------ .../scenario/{item.jsp => item.html} | 26 +------------ 13 files changed, 21 insertions(+), 238 deletions(-) rename main_vm/src/main/resources/templates/layout/adm/include/{addIntentExample.jsp => addIntentExample.html} (91%) rename main_vm/src/main/resources/templates/layout/adm/rcp/monitoring/{consulting.jsp => consulting.html} (92%) rename main_vm/src/main/resources/templates/layout/adm/rcp/monitoring/{conversationMark.jsp => conversationMark.html} (90%) rename main_vm/src/main/resources/templates/layout/adm/rcp/monitoring/{intentAnalysis.jsp => intentAnalysis.html} (92%) rename main_vm/src/main/resources/templates/layout/adm/rcp/monitoring/{outscenario.jsp => outscenario.html} (90%) rename main_vm/src/main/resources/templates/layout/adm/rcp/statistics/call/{info.jsp => info.html} (89%) rename main_vm/src/main/resources/templates/layout/adm/rcp/statistics/intent/{day.jsp => day.html} (94%) rename main_vm/src/main/resources/templates/layout/adm/rcp/statistics/intent/{item.jsp => item.html} (88%) rename main_vm/src/main/resources/templates/layout/adm/rcp/statistics/scenario/{day.jsp => day.html} (86%) rename main_vm/src/main/resources/templates/layout/adm/rcp/statistics/scenario/{item.jsp => item.html} (87%) diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/rcp/monitoring/controller/MonitoringConversationMarkController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/rcp/monitoring/controller/MonitoringConversationMarkController.java index a82918d..646e9f6 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/rcp/monitoring/controller/MonitoringConversationMarkController.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/rcp/monitoring/controller/MonitoringConversationMarkController.java @@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -146,4 +147,9 @@ public class MonitoringConversationMarkController { return "adm/include/addIntentExample"; } + @GetMapping(value = "/intent/addexamplepopuphtml.do") + public ModelAndView addIntentExamplePopupHtml() { + return new ModelAndView("/layout/adm/include/addIntentExample"); + } + } diff --git a/main_vm/src/main/resources/static/aajs/conversationMark.js b/main_vm/src/main/resources/static/aajs/conversationMark.js index bd9e0a4..c69ffa1 100644 --- a/main_vm/src/main/resources/static/aajs/conversationMark.js +++ b/main_vm/src/main/resources/static/aajs/conversationMark.js @@ -721,6 +721,8 @@ var Bookmark = { } $(document).ready(function () { + $('#addexamplepopup').load('/admin/rcp/statistics/monitoring/intent/addexamplepopuphtml.do'); + Bookmark.init(); $('#addBookmarkBtn').on('click', function() { diff --git a/main_vm/src/main/resources/static/aajs/intentAnalysis.js b/main_vm/src/main/resources/static/aajs/intentAnalysis.js index 6f6f29d..aced68e 100644 --- a/main_vm/src/main/resources/static/aajs/intentAnalysis.js +++ b/main_vm/src/main/resources/static/aajs/intentAnalysis.js @@ -832,6 +832,8 @@ var IntentAnalysis = { } $(document).ready(function () { + $('#addexamplepopup').load('/admin/rcp/statistics/monitoring/intent/addexamplepopuphtml.do'); + IntentAnalysis.init(); $('#oprMngCode').on('change', function() { diff --git a/main_vm/src/main/resources/templates/layout/adm/include/addIntentExample.jsp b/main_vm/src/main/resources/templates/layout/adm/include/addIntentExample.html similarity index 91% rename from main_vm/src/main/resources/templates/layout/adm/include/addIntentExample.jsp rename to main_vm/src/main/resources/templates/layout/adm/include/addIntentExample.html index 06e5b76..201e58c 100644 --- a/main_vm/src/main/resources/templates/layout/adm/include/addIntentExample.jsp +++ b/main_vm/src/main/resources/templates/layout/adm/include/addIntentExample.html @@ -1,8 +1,3 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - - -