合并分支 'crs' 到 'master'

src/components/basicInformation/role/authority.vue

@@ -14,7 +14,6 @@
                 <span>角色权限：</span>
                 <span style="margin-left: 180px;">
                     <span class="selected" @click="selected">
-                        <span class="img"></span>
                         <span class="val">全选</span>
                     </span>
                 </span>
@@ -120,7 +119,6 @@ export default {
             if (this.clickAll === false) {
                 $('.selected').addClass('selectedClick');
                 $('.authorityList>span').addClass('authorityListClick');
-                $('.selected .img').addClass('noClick')
                 $('.val').html('全不选')
                 this.allAuthority = [];
                 for (let item of this.authority) {
@@ -128,7 +126,6 @@ export default {
                 }
                 this.clickAll = true;
             } else {
-                $('.selected .img').removeClass('noClick')
                 $('.selected').removeClass('selectedClick');
                 $('.val').html('全选')
                 this.allAuthority = [];
@@ -199,15 +196,6 @@ export default {
         cursor: pointer;
         color: #4877e6;
     }
-    .authority .img{
-        display: inline-block;
-        width: 19px;
-        height: 19px;
-        background: url("./img/selected.png");
-    }
-    .authority .noClick{
-        background: url("./img/selectedN.png");
-    }
     .authority .authorityList{
         width: 280px;
         display: flex;

src/components/home/home.vue

@@ -50,6 +50,10 @@
                         <img src="./img/PG.png">
                         <span>评估报告管理</span>
                     </p>
+                    <p class="bg" @click="otherJump">
+                        <img src="./img/PC.png">
+                        <span>评测报告管理</span>
+                    </p>
                     <p class="bg" v-if="this.$store.getters.getUserData.type !== 1" @click="jump('projectManagement',2,'我的项目')">
                         <img src="./img/WD.png">
                         <span>我的项目</span>
@@ -68,7 +72,6 @@
                     </p>
                     <p class="blank"></p>
                     <p class="blank"></p>
-                    <p class="blank"></p>
                 </div>
                 <div class="menu" v-if="this.$store.getters.getUserData.type === 1">
                     <p class="bg" v-if="this.$store.getters.getUserData.type === 1" @click="jump('keyTechnology',4,'关键技术管理')">
@@ -116,6 +119,9 @@ export default {
             this.$store.commit('changeHomeClick', val); // 传给导航进行样式定位和点击事件
             this.$store.commit('changeNowPath', path); // 当前path传给header作比对
             this.$router.push({name: path});
+        },
+        otherJump() {
+            window.open('http://120.55.57.35:8080/auto-test/#/AssessmentUser')
         }
     },
     components: {