冲突

src/components/assessment/homeDetailcopy.vue

@@ -290,7 +290,7 @@
               <li :class="{'box-nav-title':true,'active':isOpen1}" @click="open1">
                 系统部署架构
                 <img
-                  v-show="systemStructure.application.deploy == '' && systemStructure.application.code == '' && systemStructure.application.other == '' && systemStructure.application.edition == '' && systemStructure.database.other == '' && systemStructure.database.deploy == '' && systemStructure.database.code == '' && systemStructure.database.edition == '' && systemStructure.storage.edition == '' && systemStructure.storage.other == '' && systemStructure.storage.deploy == '' && systemStructure.storage.code == '' && systemStructure.otherEquipment.code == '' && systemStructure.otherEquipment.edition == '' && systemStructure.otherEquipment.deploy == '' && systemStructure.otherEquipment.other == '' && systemStructure.slb.code == '' && systemStructure.slb.edition == '' && systemStructure.slb.deploy == '' && systemStructure.slb.other == '' &&
+                  v-show="systemStructure.application.deploy == '' && systemStructure.application.code == '' && systemStructure.application.other == '' && systemStructure.application.edition == '' && systemStructure.database.other == '' && systemStructure.database.deploy == '' && systemStructure.database.code == '' && systemStructure.database.edition == '' && systemStructure.storage.edition == '' && systemStructure.storage.other == '' && systemStructure.storage.deploy == '' && systemStructure.storage.code == '' && systemStructure.otherEquipment.code == '' && systemStructure.otherEquipment.edition == '' && systemStructure.otherEquipment.deploy == '' && systemStructure.otherEquipment.other == '' && systemStructure.slb.code == '' && systemStructure.slb.edition == '' && systemStructure.slb.deploy == '' && systemStructure.slb.other == '' && 
                   systemStructure.vps.code == '' && systemStructure.vps.edition == '' && systemStructure.vps.deploy == '' && systemStructure.vps.other == '' &&systemStructure.cdn.code == '' && systemStructure.cdn.edition == '' && systemStructure.cdn.deploy == '' && systemStructure.cdn.other == '' &&systemStructure.nas.code == '' && systemStructure.nas.edition == '' && systemStructure.nas.deploy == '' && systemStructure.nas.other == '' &&systemStructure.otherDemand == '' && systemStructure.loadBalance == '' && systemStructure.disaster == '' && systemStructure.distributed == '' && systemStructure.nas.cpuNum == '' && systemStructure.nas.num == '' && systemStructure.nas.ghz == '' && systemStructure.cdn.cpuNum == '' && systemStructure.cdn.num == '' && systemStructure.cdn.ghz == '' && systemStructure.slb.ghz == '' && systemStructure.slb.cpuNum == '' && systemStructure.slb.num == '' && systemStructure.vps.cpuNum == '' && systemStructure.vps.ghz == '' && systemStructure.vps.num == '' && systemStructure.application.cpuNum == ''  && systemStructure.application.num == '' && systemStructure.application.ghz == '' && systemStructure.database.cpuNum == '' && systemStructure.database.num == '' && systemStructure.database.ghz == '' && systemStructure.otherEquipment.num == '' && systemStructure.otherEquipment.ghz == '' && systemStructure.otherEquipment.cpuNum == '' && systemStructure.cdn.memory == '' &&
 systemStructure.slb.memory == '' &&
 systemStructure.vps.memory == '' &&
@@ -1805,7 +1805,7 @@ systemStructure.cdn.memory != ''  "
                         <div class="radios-box">
                           <el-checkbox-group v-model="developLanguageSystem.fontDevTechnologies">
                                 <el-checkbox :label="item" v-for="(item,index) in fontDevTechnologiesList" :key="index">{{item.name}}</el-checkbox>
-
+                      
                           </el-checkbox-group>
                         </div>
                         <div class="copy-box-main-input">
@@ -2445,7 +2445,7 @@ systemStructure.cdn.memory != ''  "
                           </el-checkbox-group>
                         </div>
                       </div>
-                      <!--
+                      <!-- 
                       <div class="form-radio one left">
                         <div class="radio-text one">编目服务：</div>
                         <el-radio
@@ -2896,7 +2896,7 @@ export default {
         { code: 10, des: "", name: "LVS", version: "" },
         { code: 11, des: "", name: "LHA", version: "" },
         { code: 12, des: "", name: "GERONIMO", version: "" },
-
+  
       ],
       compatibleBrowsers1: [
         { code: 4, des: "", name: "IE Trident 内核", version: "" },
@@ -3656,12 +3656,12 @@ export default {
       console.log("======>", obj);
       console.log("ma======>", JSON.stringify(obj));
       // console.log("=231321=====>", obj.applicationType.length);
-
+   
       //  return
 
       this.$server.goPg(obj).then(res => {
         console.log(res);
-
+        
         this.$store.commit("changeRoutePg", 1);
         this.$message({
           message: "生成评估报告成功",
@@ -3794,7 +3794,7 @@ export default {
 
       this.$server.upExcel(fd).then(res => {
         console.log("导入Excel成功", res);
-
+       
         this.$message({
           message: "导入Excel成功",
           type: "success"
@@ -3833,7 +3833,7 @@ export default {
                   }
                 ];
                 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
@@ -3846,7 +3846,7 @@ export default {
                 }
                     setTimeout(() => {
                   this.compatibleBrowsersList = arr;
-
+                 
                   this.browser[key] = arr2;
                 }, 500);
               }
@@ -3933,7 +3933,7 @@ export default {
                   }
                 ];
                 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
@@ -3947,10 +3947,10 @@ export default {
                   this.middlewareEnumsList = arr;
                   this.middleware[key] = arr2;
                 }, 500);
-
+               
               }
             else if (key == "microServices") {
-
+              
                 console.log("先打印", this.middleware[key]);
                 var arr = [
                   {
@@ -4438,7 +4438,7 @@ export default {
           }else{
              this.rto = res.data.data.rto
           }
-
+          
           // this.rpo = res.data.rpo
         // this.rto = res.data.rto
            Object.keys(this.form).forEach(key => {
@@ -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)
@@ -4495,7 +4486,7 @@ export default {
                 }
                     setTimeout(() => {
                   this.compatibleBrowsersList = arr;
-
+                 
                   this.browser[key] = arr2;
                 }, 500);
               }
@@ -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)
@@ -4597,7 +4580,7 @@ export default {
                   this.middlewareEnumsList = arr;
                   this.middleware[key] = arr2;
                 }, 500);
-
+               
               }
              else if (key == "microServices") {
                 console.log("先打印", this.middleware[key]);
@@ -5069,6 +5052,7 @@ export default {
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {
+    
     this.getPrev();
     console.log("系统不熟");
   },
@@ -5082,35 +5066,35 @@ ws.onopen = function() {
      //心跳检测重置
     // heartCheck.start();
 };
-
+ 
 ws.onmessage = function (e) {
-  //1成功 2失败
+  //1成功 2失败 
     console.log('链接成功');
     if(JSON.parse(e.data).msg != ""){
       // this.myloadingText = JSON.parse(e.data)
       // var str = document.querySelector(".myloading2 .el-loading-text")
       // console.log('dsadsadsadsadsadsadsa',str)
       // console.log(this.$loading(options))
-
+  
         var str = document.querySelector(".myloading2 .el-loading-text")
       // console.log('dsadsadsadsadsadsadsa',str)
       str.innerText = JSON.parse(e.data).msg
       // console.log(JSON.parse(e.data));
     }
     // console.log(JSON.parse(e.data));
-
-
+ 
+   
 
 };
-
+ 
 ws.onclose = function() {
    console.log('链接关闭');
-
+  
 };
-
+ 
 ws.onerror = function () {
     console.log('发生异常了');
-
+  
 }
   },
   beforeCreate() {}, //生命周期 - 创建之前