Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into developer/feijinlian

src/views/setting/template/index.vue

@@ -38,16 +38,18 @@
           <el-button
             v-hasPermi="['setting:template:update']"
             size="mini"
-            type="text"
+            type="primary"
             icon="el-icon-edit"
+            plain
             @click="handleUpdate(scope.row)"
           >
-            编辑</el-button
+            修改</el-button
           >
           <el-button
             v-hasPermi="['setting:template:update']"
             size="mini"
-            type="text"
+            type="primary"
+            plain
             icon="el-icon-arrow-right"
             @click="viewTemplate(scope.row)"
           >

src/views/setting/useCaseLibrary/index.vue

@@ -87,7 +87,8 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="用例编号" align="center" prop="code" />
+      <el-table-column label="检验场景" align="center" prop="code" />
+      <!--      <el-table-column label="用例编号" align="center" prop="code" />-->
       <el-table-column label="测试类型" align="center" prop="type" />
       <el-table-column label="工具" align="center" prop="tool" />
       <el-table-column label="对应输入" align="center" prop="corresponding" />
@@ -107,18 +108,18 @@
       >
         <template slot-scope="scope">
           <el-button
-            v-hasPermi="['system:post:edit']"
             size="mini"
-            type="text"
+            type="primary"
             icon="el-icon-edit"
+            plain
             @click="handleUpdate(scope.row)"
             >修改</el-button
           >
           <el-button
-            v-hasPermi="['system:post:remove']"
             size="mini"
-            type="text"
+            type="danger"
             icon="el-icon-delete"
+            plain
             @click="handleDelete(scope.row)"
             >删除</el-button
           >
@@ -147,7 +148,7 @@
             clearable
             class="select-width"
           >
-            <el-option :value="1">type</el-option>
+            <el-option value="1" label="type"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="工具" prop="tool">
@@ -173,6 +174,29 @@
             :rows="4"
           />
         </el-form-item>
+        <el-form-item label="风险等级" prop="level">
+          <el-select
+            v-model="form.level"
+            placeholder="请选择风险等级"
+            clearable
+            class="select-width"
+          >
+            <el-option value="1" label="无风险"></el-option>
+            <el-option value="2" label="低风险"></el-option>
+            <el-option value="3" label="中风险"></el-option>
+            <el-option value="4" label="高风险"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="漏洞危害" prop="hazards">
+          <el-input
+            v-model="form.hazards"
+            type="textarea"
+            placeholder="请输入漏洞危害"
+            maxlength="100"
+            show-word-limit
+            :rows="4"
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -197,7 +221,7 @@ export default {
       // 表格数据
       postList: [
         {
-          code: '101',
+          code: 'TBOX-蜂窝以太网接口',
           type: '系统服务漏扫',
           tool: 'CMW500+白卡、Nessus',
           corresponding: