合并分支 'thy' 到 'master'

src/components/assessment/homeDetailcopy.vue

@@ -235,12 +235,68 @@
             <!-- <div class="line"></div> -->
             <!-- <div class="open-box" v-show="isOpen"> -->
               <div class="open-box-nav">
-                <li :class="{'box-nav-title':true,'active':isOpen1}" @click="open1">系统部署架构</li>
-                <li :class="{'box-nav-title':true,'active':isOpen2}" @click="open2">前端浏览器相关</li>
-                <li :class="{'box-nav-title':true,'active':isOpen3}" @click="open3">中间件/API相关</li>
-                <li :class="{'box-nav-title':true,'active':isOpen4}" @click="open4">数据库相关</li>
-                <li :class="{'box-nav-title':true,'active':isOpen5}" @click="open5">迁移策略</li>
-                <li :class="{'box-nav-title':true,'active':isOpen6}" @click="open6">额外申请</li>
+                <li :class="{'box-nav-title':true,'active':isOpen1}" @click="open1">系统部署架构  <img
+                    v-show="systemStructure.application.deploy == '' && systemStructure.application.operateSystem == '' && systemStructure.application.other == '' && systemStructure.application.edition == '' && systemStructure.database.other == '' && systemStructure.database.deploy == '' && systemStructure.database.operateSystem == '' && systemStructure.database.edition == '' && systemStructure.storage.edition == '' && systemStructure.storage.other == '' && systemStructure.storage.deploy == '' && systemStructure.storage.operateSystem == '' && systemStructure.otherEquipment.operateSystem == '' && systemStructure.otherEquipment.edition == '' && systemStructure.otherEquipment.deploy == '' && systemStructure.otherEquipment.other == '' && systemStructure.slb.operateSystem == '' && systemStructure.slb.edition == '' && systemStructure.slb.deploy == '' && systemStructure.slb.other == '' && systemStructure.otherDemand == '' && systemStructure.loadBalance == '' && systemStructure.disaster == '' && systemStructure.distributed == ''"
+                    src="./img/noform.png"
+                    alt
+                  
+                  />
+                  <img
+                    v-show="systemStructure.application.deploy != '' || systemStructure.application.operateSystem != '' || systemStructure.application.other != '' || systemStructure.application.edition != '' ||  systemStructure.database.other != '' || systemStructure.database.deploy != '' || systemStructure.database.operateSystem != '' || systemStructure.database.edition != '' || systemStructure.storage.edition != '' || systemStructure.storage.other != '' || systemStructure.storage.deploy != '' || systemStructure.storage.operateSystem != '' || systemStructure.otherEquipment.operateSystem != '' || systemStructure.otherEquipment.edition != '' || systemStructure.otherEquipment.deploy != '' || systemStructure.otherEquipment.other != '' || systemStructure.slb.operateSystem != '' || systemStructure.slb.edition != '' || systemStructure.slb.deploy != '' || systemStructure.slb.other != '' || systemStructure.otherDemand != '' || systemStructure.loadBalance != '' || systemStructure.disaster != '' || systemStructure.distributed != ''"
+                    src="./img/doform.png"
+                    alt
+                    
+                  /></li>
+                <li :class="{'box-nav-title':true,'active':isOpen2}" @click="open2">前端浏览器相关   <img
+                    v-show="browser.plugInUnit == '' && browser.compatibleBrowsers == '' && browser.otherBrowser=='' && browser.geography == '' && browser.peripheral == '' && browser.media == '' && browser.animation== '' && browser.document == '' && browser.threeD == ''&& browser.flash == '' &&  browser.otherDemand == ''"
+                    src="./img/noform.png"
+                    alt
+                    
+                  />
+                  <img
+                    v-show="browser.plugInUnit != '' || browser.compatibleBrowsers != '' || browser.otherBrowser!='' || browser.geography != '' || browser.peripheral != '' || browser.media != '' || browser.animation!= '' || browser.document != '' || browser.threeD != '' || browser.flash != '' ||  browser.otherDemand != ''"
+                    src="./img/doform.png"
+                    alt
+                   
+                  /></li>
+                <li :class="{'box-nav-title':true,'active':isOpen3}" @click="open3">中间件/API相关   <img
+                    v-show="middleware.middlewareEnums == '' && middleware.otherMiddleware == '' && middleware.web==''&& middleware.jndi == '' && middleware.jms == '' && middleware.route == ''"
+                    src="./img/noform.png"
+                    alt
+                    
+                  />
+                  <img
+                    v-show="middleware.middlewareEnums != '' || middleware.otherMiddleware != '' || middleware.web!='' || middleware.jndi != '' || middleware.jms != '' || middleware.route != ''"
+                    src="./img/doform.png"
+                    alt
+                   
+                  /></li>
+                <li :class="{'box-nav-title':true,'active':isOpen4}" @click="open4">数据库相关   <img
+                    v-show="database.databaseType == '' && database.othertype == '' && database.view =='' && database.storage == ''&& database.function == '' && database.dbLink == '' && database.sequence == '' && database.timeTask == '' && database.trigger == '' && database.disasterTolerance == ''&& database.separate == '' && database.safe == '' && database.performance == ''&& database.otherContent == ''"
+                    src="./img/noform.png"
+                    alt
+                  
+                  />
+                  <img
+                    v-show="database.databaseType != '' || database.othertype != '' || database.view !='' || database.storage != '' || database.function != '' || database.dbLink != '' || database.sequence != '' || database.timeTask != '' || database.trigger != '' || database.disasterTolerance != ''|| database.separate != '' || database.safe != '' || database.performance != ''|| database.otherContent != ''"
+                    src="./img/doform.png"
+                    alt
+                  
+                  /></li>
+                <li :class="{'box-nav-title':true,'active':isOpen5}" @click="open5">迁移策略    <img v-show="strategy == ''" src="./img/noform.png" alt />
+                  <img v-show="strategy != ''" src="./img/doform.png" alt  /></li>
+                <li :class="{'box-nav-title':true,'active':isOpen6}" @click="open6">额外申请   <img
+                    v-show="apply.reason == '' && apply.cost == ''"
+                    src="./img/noform.png"
+                    alt
+                   
+                  />
+                  <img
+                    v-show="apply.reason != '' || apply.cost != ''"
+                    src="./img/doform.png"
+                    alt
+                 
+                  /></li>
               </div>
             <div class="open-box">
               <div class="copy-nav-box">

src/components/header/header.vue

@@ -26,7 +26,7 @@
             </span>
         </span>
         </div>
-        <div style="height: 40px;background: #fff;" v-if=" $route.name == 'assessmentReport'?false:$route.path == '/firstHome'?false:true">
+        <div style="height: 40px;background: #fff;" v-if=" $route.name == 'assessmentReport'?false:$route.name == 'reportAssess'?false:$route.path == '/firstHome'?false:true">
             <p class="list">
                 <span class="menuTitle goTitle" @click="go">{{sidebar.name}}</span>
                 <span v-for="(item,index) of sidebar.menu" :key="index" class="listVal" @click="jump(item.path, index)">