冲突

src/components/assessment/homeDetailcopy.vue

@@ -4472,21 +4472,12 @@ export default {
                     version: ""
                   }
                 ];
-<<<<<<< HEAD
-                for(var i = 0 ; i < res.data.browser[key].length ; i ++){
-
-                  if(res.data.browser[key][i].code == 3){
-                     console.log("?????", res.data.browser[key][i].des)
-                    arr[0].des = res.data.browser[key][i].des
-                    arr2[0].des = res.data.browser[key][i].des
-=======
                 for(var i = 0 ; i < res.data.data.browser[key].length ; i ++){
                   
                   if(res.data.data.browser[key][i].code == 3){
                      console.log("?????", res.data.data.browser[key][i].des)
                     arr[0].des = res.data.data.browser[key][i].des
                     arr2[0].des = res.data.data.browser[key][i].des
->>>>>>> 10c6a32adea96e0d3b70fab7cbc2bc5d59c6900f
                   }else{
                       arr.push(res.data.data.browser[key][i].code);
 //  console.log(" this.middleware.middlewareEnums", arr)
@@ -4574,19 +4565,11 @@ export default {
                     version: ""
                   }
                 ];
-<<<<<<< HEAD
-                for(var i = 0 ; i < res.data.middleware[key].length ; i ++){
-
-                  if(res.data.middleware[key][i].code == 15){
-                    arr[0].des = res.data.middleware[key][i].des
-                    arr2[0].des = res.data.middleware[key][i].des
-=======
                 for(var i = 0 ; i < res.data.data.middleware[key].length ; i ++){
                   
                   if(res.data.data.middleware[key][i].code == 15){
                     arr[0].des = res.data.data.middleware[key][i].des
                     arr2[0].des = res.data.data.middleware[key][i].des
->>>>>>> 10c6a32adea96e0d3b70fab7cbc2bc5d59c6900f
                   }else{
                       arr.push(res.data.data.middleware[key][i].code);
  console.log(" this.middleware.middlewareEnums", arr)
@@ -5069,6 +5052,7 @@ export default {
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {
+    
     this.getPrev();
     console.log("系统不熟");
   },