shjung 3 年之前
父节点
当前提交
fa7840d6ea

+ 10 - 5
src/main/resources/static/application/op/00.main/main.css

@@ -576,6 +576,9 @@ cursor: pointer;
   margin-left: 10px;
   margin-right: 20px;
 }
+.serve-menu-box .dx-menu-item-popout{
+  display: none;
+}
 .log-out{
   margin-left: auto;
   display: flex;
@@ -596,7 +599,9 @@ cursor: pointer;
 .dx-icon{
   font-size: 18px !important;
 }
-
+.dx-menu-item-popout{
+  font-size: 22px !important;
+}
 .dx-menu-item-text{
   font-family: 맑은 고딕;
   font-size  : 10pt !important;
@@ -605,13 +610,13 @@ cursor: pointer;
 .p-5{
   padding: 5px !important;
 }
-.dx-menu-item-popout{
- display: none;
-}
+/* .dx-menu-item-popout{
+    display: none;
+} */
 .dx-icon.dx-icon-menu{
   margin-right: 0 !important;
   font-size: 18px !important;
-}
+} 
 
 .switch-box{
   display: none;

+ 12 - 3
src/main/resources/static/application/op/04-1.statistics/04.incident/incident.js

@@ -67,6 +67,16 @@ $(()=>{
             stylingMode: 'outlined',
             value: '유형별 통계',
             onItemClick(e) {
+                if (incidentTable.option('dataSource').length > 0 ){
+                    incidentTable.option('dataSource', []);
+                    for (let obj of series) {
+                        obj.data = [];
+                    }
+                    incidentChart.update({
+                        series : series,
+                    })
+                    
+                } 
                 switch (e.itemData) {
                     case '유형별 통계':
                         //컬럼 toggle
@@ -502,7 +512,6 @@ function finalEvent( uri, updateData, timeFormatLength ){
     //getData( uri, incidentData, updateData );
     getDataAsync(uri, (jsonData)=>{
         incidentData = jsonData;
-        console.log(incidentData);
         for (let obj of series) {
             obj.data = [];
         }
@@ -532,8 +541,8 @@ function finalEvent( uri, updateData, timeFormatLength ){
                     return this.x + '<br>'+this.series.name + " : " + this.y;
                 }
             },
-        })
-        
+        });
+
         pageNation(incidentChart, xAxis);
         
         alertConfirm('데이터 조회가 완료 되었습니다. [' + incidentData.length + '건]');

+ 6 - 7
src/main/resources/static/application/wall/main/main-func.js

@@ -129,13 +129,13 @@ function onMouseClickFunc(ALyrIdx, ALyrName, ANmbr, ACoordX, ACoordY, X, Y) {
     }
 }
 function onContextMenuFunc(ALyrIdx, ALyrName, ANmbr, ACoordX, ACoordY, X, Y) {
-    //console.log(`${currDt()}: onContextMenuFunc, ${ALyrIdx}, ${ALyrName}, ${ANmbr}, ${ACoordX}, ${ACoordY}, ${X}, ${Y}`);
+    console.log(`${currDt()}: onContextMenuFunc, ${ALyrIdx}, ${ALyrName}, ${ANmbr}, ${ACoordX}, ${ACoordY}, ${X}, ${Y}`);
 }
 function onSelectObjFunc(ALyrIdx, ALyrName, ANmbr, ACoordX, ACoordY, X, Y) {
-    //console.log(`${currDt()}: onSelectObjFunc, ${ALyrIdx}, ${ALyrName}, ${ANmbr}, ${ACoordX}, ${ACoordY}, ${X}, ${Y}`);
+    console.log(`${currDt()}: onSelectObjFunc, ${ALyrIdx}, ${ALyrName}, ${ANmbr}, ${ACoordX}, ${ACoordY}, ${X}, ${Y}`);
 }
 function onFcltDragEndFunc(ALyrIdx, ALyrName, ANmbr, ACoordX, ACoordY) {
-    //console.log(`${currDt()}: onFcltDragEndFunc, ${ALyrIdx}, ${ALyrName}, ${ANmbr}, ${ACoordX}, ${ACoordY}`);
+    console.log(`${currDt()}: onFcltDragEndFunc, ${ALyrIdx}, ${ALyrName}, ${ANmbr}, ${ACoordX}, ${ACoordY}`);
 }
 
 let _timerFetchWeatherStts = null;
@@ -441,7 +441,6 @@ function recvWeatherInfo(jsonData) {
         window.clearInterval(_weatherTimer);
     }
     let cnt = 0;
-    //console.log(jsonData);
     const data = jsonData[cnt++];
     weatherInterval(data);
 
@@ -540,7 +539,7 @@ async function fetchBaseVrtx() {
 
 async function fetchFcltData() {
     //console.time("***** fetchFcltData: ");
-    //console.log("LayerIndex.Cctv = " + LayerIndex.Cctv);
+    console.log("LayerIndex.Cctv = " + LayerIndex.Cctv);
     const cctv = apiGet("/api/cctv/common/cctv-list"); // CCTV
     const vms = apiGet("/api/vms/common/vms-list"); // VMS
     const vds = apiGet("/api/vds/common/vds-list"); // VDS
@@ -709,7 +708,7 @@ export async function fetchUnitStts() {
         let stop = document.getElementsByName("windowPopCheckValue")[0].checked;
         if (stop) {
             _windowPopFlag = false;
-            //console.log("_windowPopFlag=" + _windowPopFlag);
+            console.log("_windowPopFlag=" + _windowPopFlag);
         }
     });
 
@@ -1006,7 +1005,7 @@ function cctvPopupInfoBox(ISTL_LCTN_NM, STRM_RTMP_ADDR, x, y) {
     $("#map_popup_cctv").draggable(); //팝업끌기 UI jQuery기능
 
     let cctvOffset = $("#map_popup_cctv").offset();
-    //console.log("cctvOffset = " + JSON.stringify(cctvOffset));
+    console.log("cctvOffset = " + JSON.stringify(cctvOffset));
 
     if (cctvOffset.top < 164) {
         $("#map_popup_cctv").parent().css("margin-top", "-20px");