解决冲突

Signed-off-by: zouap <zouap@pcl.ac.cn>

public/home/search.js

@@ -129,32 +129,6 @@ function search(){
     }
 }
 
-function parseLog(){
-    let jsonValue = document.getElementById("json_value").value;
-    let jsonObj = JSON.parse(jsonValue);
-    let podRoleName = jsonObj["podRoleName"];
-    let html = "";
-    if (podRoleName != null){
-         let task0 = podRoleName["task1-0"];
-         let podEvents = jsonObj["podEvents"];
-         let podEventArray = podEvents[task0];
-         if(podEventArray != null){
-             for(int i=0; i < podEventArray.length;i++){
-                 html +="<p>" +podEventArray[i]["reason"] +  "</p>";
-                 html +="<p>" +podEventArray[i]["message"] +  "</p>";
-                 html +="<p>" +podEventArray[i]["action"] +  "</p>";
-             }
-         }
-         let extras= jsonObj["extras"];
-         if(extras != null){
-                 html +="<p>" +extras["reason"] +  "</p>";
-                 html +="<p>" +extras["message"] +  "</p>";
-                 html +="<p>" +extras["action"] +  "</p>";
-         }
-         document.getElementById("info_display").innerHTML=html;
-    }
- }
-
 function emptySearch(){
     initDiv(false);
     initPageInfo();