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

Wangfeng 500 dev



See merge request !1236

@@ -21,7 +21,7 @@
                 </el-form>
                 </el-form>
             </div>
             </div>
         </div>
         </div>
-        <el-row :gutter="20" style="padding: 3px 10px;" v-show="userVulnRole == 'bugManager'">
+        <el-row :gutter="20" style="padding: 3px 10px;" v-show="userVulnRole != 'manufacturer'">
             <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>
@@ -121,7 +121,7 @@
                     ref="handleRefForm">
                     ref="handleRefForm">
 
 
                 <el-form-item label="厂商" prop="manufacturer">
                 <el-form-item label="厂商" prop="manufacturer">
-                    <el-input :size="$global.elementConfig.size.input" clearable v-model="handleForm.manufacturer" disabled></el-input>
+                    <el-input :size="$global.elementConfig.size.input" clearable v-model="handleForm.manufacturerName" disabled></el-input>
                 </el-form-item>
                 </el-form-item>
 
 
                 <el-form-item label="处理时间" prop="solveTime">
                 <el-form-item label="处理时间" prop="solveTime">

@@ -89,6 +89,11 @@ export default {
                     proxy.$http.post('/api-web/vulnerabilities/save', docForm.value, function (res) {
                     proxy.$http.post('/api-web/vulnerabilities/save', docForm.value, function (res) {
                         addDialogVisible.value = false;
                         addDialogVisible.value = false;
                         getVulnerabilityList();
                         getVulnerabilityList();
+                        docForm.value.name = '';
+                        docForm.value.level = '';
+                        docForm.value.remark = '';
+                        docForm.value.impactSite = '';
+                        docForm.value.repairSuggestions = '';
                     })
                     })
                 }
                 }
             })
             })
@@ -143,12 +148,11 @@ export default {
             handleVisible.value = false;
             handleVisible.value = false;
         }
         }
         let handleForm = Vue.ref({
         let handleForm = Vue.ref({
-            manufacturer:'',
+            manufacturerName:'',
             solveResult:'',
             solveResult:'',
             solveRemark:'',
             solveRemark:'',
             solveTime:'',
             solveTime:'',
             vulnerabilitiesId:''
             vulnerabilitiesId:''
-
         })
         })
         let handleRulesForm = Vue.ref({
         let handleRulesForm = Vue.ref({
             solveResult:[{
             solveResult:[{
@@ -168,6 +172,18 @@ export default {
                 if (validate){
                 if (validate){
                     proxy.$http.post('/api-web/vulnerabilities/solve',handleForm.value, function (res) {
                     proxy.$http.post('/api-web/vulnerabilities/solve',handleForm.value, function (res) {
                         handleVisible.value = false;
                         handleVisible.value = false;
+
+                        handleForm.value.manufacturerName = '';
+                        handleForm.value.solveResult = '';
+                        handleForm.value.solveRemark = '';
+                        handleForm.value.solveTime = '';
+                        handleForm.value.vulnerabilitiesId = '';
+
+                        if(res.success){
+                            proxy.$global.showMsg('处理成功');
+                        }else{
+                            proxy.$global.showMsg('处理失败，请稍后再试！', 'warning');
+                        }
                     })
                     })
                 }
                 }
             })
             })
@@ -191,8 +207,7 @@ export default {
         // 获取当前登陆人所属厂商
         // 获取当前登陆人所属厂商
         const getManufacturer = ()=>{
         const getManufacturer = ()=>{
             proxy.$http.get('/api-web/vulnerabilities/manufacturer',{}, function (res) {
             proxy.$http.get('/api-web/vulnerabilities/manufacturer',{}, function (res) {
-                // console.log("res---->",res.str)
-                handleForm.value.manufacturer = res.str;
+                handleForm.value.manufacturerName = res.str;
             })
             })
         }
         }