Merge branch 'wangfeng-500-dev' into 'master-500-dev'

bug修复



See merge request !1235

@@ -8,6 +8,7 @@
                     </el-form-item>
                     </el-form-item>
                     <el-form-item>
                     <el-form-item>
                         <el-select  clearable :size="$global.elementConfig.size.input" v-model="queryParams.type" placeholder="漏洞类型">
                         <el-select  clearable :size="$global.elementConfig.size.input" v-model="queryParams.type" placeholder="漏洞类型">
+                            <el-option :value="" label="全部漏洞"/>
                             <el-option :value="1" label="高危漏洞"/>
                             <el-option :value="1" label="高危漏洞"/>
                             <el-option :value="2" label="中危漏洞"/>
                             <el-option :value="2" label="中危漏洞"/>
                             <el-option :value="3" label="低危漏洞"/>
                             <el-option :value="3" label="低危漏洞"/>
@@ -20,8 +21,7 @@
                 </el-form>
                 </el-form>
             </div>
             </div>
         </div>
         </div>
-
-        <el-row :gutter="20" style="padding: 3px 10px;">
+        <el-row :gutter="20" style="padding: 3px 10px;" v-show="userVulnRole == 'bugManager'">
             <el-col :span="1">
             <el-col :span="1">
                 <el-button @click="handleAdd" type="primary" >新增</el-button>
                 <el-button @click="handleAdd" type="primary" >新增</el-button>
             </el-col>
             </el-col>
@@ -44,18 +44,20 @@
                 </template>
                 </template>
                 <template #tools="{scope}">
                 <template #tools="{scope}">
                     <div class="list-handle">
                     <div class="list-handle">
-                        <span class="icon-bg" @click="handleFun(scope.row)">
+                        <span class="icon-bg" @click="handleFun(scope.row)"
+                              v-show=" '1' == scope.row.currentUserResolution.isRelated" >
                              <i class="el-icon-s-check" title="处理"></i>
                              <i class="el-icon-s-check" title="处理"></i>
                         </span>
                         </span>
                         <span class="icon-bg" @click="handleDetail(scope.row)">
                         <span class="icon-bg" @click="handleDetail(scope.row)">
                              <i class="el-icon-view" title="详情"></i>
                              <i class="el-icon-view" title="详情"></i>
                         </span>
                         </span>
-                        <span class="icon-bg" @click="handleDel(scope.row)">
+                        <span class="icon-bg" @click="handleDel(scope.row)"
+                              v-show = "userVulnRole != 'manufacturer' ">
                              <i class="el-icon-delete"></i>
                              <i class="el-icon-delete"></i>
                         </span>
                         </span>
-                        <span class="icon-bg"@click="handleDownload(scope.row)">
-                             <i class="el-icon-download" title="下载"></i>
-                        </span>
+                        <!--<span class="icon-bg"@click="handleDownload(scope.row)">-->
+                        <!--     <i class="el-icon-download" title="下载"></i>-->
+                        <!--</span>-->
                     </div>
                     </div>
                 </template>
                 </template>
             </cm-table-page>
             </cm-table-page>

@@ -23,7 +23,7 @@ export default {
                 },
                 },
                 {
                 {
                     prop: 'level',
                     prop: 'level',
-                    label: '漏洞级别',
+                    label: '漏洞类型',
                     sortable: true,
                     sortable: true,
                     align: 'center'
                     align: 'center'
                 },
                 },
@@ -57,8 +57,7 @@ export default {
         })
         })
 
 
         let dataList = Vue.ref([]);
         let dataList = Vue.ref([]);
-        let totalCount = Vue.ref(0);
-
+        let userVulnRole = Vue.ref('');
         let addDialogVisible = Vue.ref(false)
         let addDialogVisible = Vue.ref(false)
         let addDialogTitle = Vue.ref('')
         let addDialogTitle = Vue.ref('')
 
 
@@ -199,7 +198,7 @@ export default {
 
 
         // 获取漏洞列表
         // 获取漏洞列表
         const getVulnerabilityList = ()=>{
         const getVulnerabilityList = ()=>{
-            proxy.$http.get('/api-web/vulnerabilities/list', queryParams, function (res) {
+            proxy.$http.get('/api-web/vulnerabilities/list', queryParams.value, function (res) {
                 if (res.data) {
                 if (res.data) {
                     dataList.value = res.data;
                     dataList.value = res.data;
                     queryParams.value.count = res.count;
                     queryParams.value.count = res.count;
@@ -212,7 +211,15 @@ export default {
             getVulnerabilityList();
             getVulnerabilityList();
         }
         }
 
 
+        // 获取当前登陆人漏洞处理角色
+        const getRole =()=>{
+            proxy.$http.get('/api-web/vulnerabilities/role',{}, function (res) {
+                userVulnRole.value = res.str;
+            })
+        }
+
         Vue.onMounted(() => {
         Vue.onMounted(() => {
+            getRole();
             getVulnerabilityList();
             getVulnerabilityList();
         })
         })
 
 
@@ -240,7 +247,8 @@ export default {
             dataList,
             dataList,
             handleQuery,
             handleQuery,
             viewDrawer,
             viewDrawer,
-            detail
+            detail,
+            userVulnRole
         };
         };
     },
     },
 }
 }