fix issue

web_src/js/index.js

@@ -4492,11 +4492,7 @@ function initVueDataAnalysis() {
 
   new Vue({
     el: '#data_analysis',
-<<<<<<< HEAD
-
-=======
     router,
->>>>>>> V20220519
     render: h => h(DataAnalysis)
   });
 }