更新样式

src/router/index.js

@@ -15,8 +15,8 @@ import kdspDecrypt from '../views/effect/KdspDecrypt'
 import JenkinsBuildInfo from '../views/effect/JenkinsBuildInfo'
 import LoginWhiteList from '../views/effect/LoginWhiteList'
 // 2021-040-09新添加
-import ProjectList from '../views/auto/Project'
-import ModelList from '../views/auto/Model'
+import ProjectList from '../views/auto/ProjectList'
+import ModelList from '../views/auto/ModelList'
 import InterfaceList from '../views/auto/InterfaceList'
 import JiraNotify from '../views/jira/Notify'
 import RiskControl from '../views/vcc/RiskControl'
@@ -102,12 +102,12 @@ const router = new Router({
         },
         // 2021-4-08新添加项目管理页面
         {
-          path: '/auto/Project',
+          path: '/auto/ProjectList',
           name: ProjectList,
           component: ProjectList
         },
         {
-          path: '/auto/Model',
+          path: '/auto/ModelList',
           name: ModelList,
           component: ModelList
         },

src/views/auto/AddCase.vue

 <template>
   <div>
-    <el-form ref="caseForm" :rules="rules" :model="caseForm" label-width="90px">
+    <el-form ref="caseFormRef" :rules="rules" :model="caseForm" label-width="90px">
       <el-form-item label="模块名称:" prop="moduleId">
         <el-select v-model="caseForm.moduleId" placeholder="请选择模块" @change="selectChangeModel" clearable>
           <el-option v-for="item in modelList" :key="item.id" :label="item.name" :value="item.id"></el-option>
@@ -25,10 +25,10 @@
                 <el-col :span="6">
                   <div class="grid-content" style="margin-left:15px">参数名称</div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="10">
                   <div class="grid-content" style="margin-left:15px">参数值</div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="2">
                   <div class="grid-content" style="margin-left:25px">操作</div>
                 </el-col>
               </el-row>
@@ -38,14 +38,14 @@
                     <el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input>
                   </div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="10">
                   <div>
                     <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input>
                   </div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="2">
                   <div>
-                    <el-button size="mini" type="danger" @click="advanceDelss(index)" style="height:40px;margin-left:20px">删除</el-button>
+                    <el-button size="mini" type="danger" @click="advanceDelss(index)" icon="el-icon-delete" style="height:40px;margin-left:20px">删除</el-button>
                   </div>
                 </el-col>
               </el-row>
@@ -59,10 +59,10 @@
                 <el-col :span="6">
                   <div class="grid-content" style="margin-left:15px">参数名称</div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="10">
                   <div class="grid-content" style="margin-left:15px">参数值</div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="2">
                   <div class="grid-content" style="margin-left:25px">操作</div>
                 </el-col>
               </el-row>
@@ -72,14 +72,14 @@
                     <el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input>
                   </div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="10">
                   <div>
                     <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input>
                   </div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="2">
                   <div>
-                    <el-button size="mini" type="danger" @click="requestParamsDel(index)" style="height:40px;margin-left:20px">删除</el-button>
+                    <el-button size="mini" type="danger" @click="requestParamsDel(index)" icon="el-icon-delete" style="height:40px;margin-left:20px">删除</el-button>
                   </div>
                 </el-col>
               </el-row>
@@ -93,10 +93,10 @@
                 <el-col :span="6">
                   <div class="grid-content" style="margin-left:15px">参数名称</div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="10">
                   <div class="grid-content" style="margin-left:15px">参数值</div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="2">
                   <div class="grid-content" style="margin-left:25px">操作</div>
                 </el-col>
               </el-row>
@@ -106,14 +106,14 @@
                     <el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input>
                   </div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="10">
                   <div>
                     <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input>
                   </div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="2">
                   <div>
-                    <el-button size="mini" type="danger" @click="paramsDel(index)" style="height:40px;margin-left:20px">删除</el-button>
+                    <el-button size="mini" type="danger" @click="paramsDel(index)" icon="el-icon-delete" style="height:40px;margin-left:20px">删除</el-button>
                   </div>
                 </el-col>
               </el-row>
@@ -125,29 +125,29 @@
             <el-form-item>
               <el-row>
                 <el-col :span="6">
-                  <div class="grid-content" style="margin-left:15px">参数名称</div>
+                  <div class="grid-content" style="margin-left:15px">变量名称</div>
                 </el-col>
-                <el-col :span="6">
-                  <div class="grid-content" style="margin-left:15px">参数值</div>
+                <el-col :span="10">
+                  <div class="grid-content" style="margin-left:15px">json路径表达式</div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="2">
                   <div class="grid-content" style="margin-left:25px">操作</div>
                 </el-col>
               </el-row>
               <el-row v-for="(item,index) in responseList" :key="index">
                 <el-col :span="6">
                   <div>
-                    <el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input>
+                    <el-input v-model.trim="item.paramsName" placeholder="请输入变量名称"></el-input>
                   </div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="10">
                   <div>
-                    <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input>
+                    <el-input v-model.trim="item.paramsValue" placeholder="请输入表达式"></el-input>
                   </div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="2">
                   <div>
-                    <el-button size="mini" type="danger" @click="responeDel(index)" style="height:40px;margin-left:20px">删除</el-button>
+                    <el-button size="mini" type="danger" @click="responeDel(index)" icon="el-icon-delete" style="height:40px;margin-left:20px">删除</el-button>
                   </div>
                 </el-col>
               </el-row>
@@ -157,13 +157,13 @@
           <el-collapse-item name="5" title="结果断言">
             <el-button type="success" plain @click="AddAssertionListRow()" class="el-icon-circle-plus">添加行</el-button>
             <el-table :data="assertionList" border style="width:100%;margin-top: 15px;">
-              <el-table-column label="参数名称" width="150">
+              <el-table-column label="参数名称" width="200">
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.paramsName">
                   </el-input>
                 </template>
               </el-table-column>
-              <el-table-column label="参数值" width="150">
+              <el-table-column label="参数值" width="350">
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.paramsValue">
                   </el-input>
@@ -174,19 +174,19 @@
                   <el-switch v-model="scope.row.isRequired" active-color="#13ce66" inactive-color="#A9A9A9" active-text="是" inactive-text="否" @change="changeState()"></el-switch>
                 </template>
               </el-table-column>
-              <el-table-column label="示例" width="300">
+              <!-- <el-table-column label="示例" width="300">
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.examples"></el-input>
                 </template>
-              </el-table-column>
-              <el-table-column label="备注" width="300">
+              </el-table-column> -->
+              <el-table-column label="备注" width="250">
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.remarks"></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="操作">
                 <template slot-scope="scope">
-                  <el-button size="mini" type="danger" @click="AssertionDelete(scope.$index)">删除</el-button>
+                  <el-button size="mini" type="danger" icon="el-icon-delete" @click="AssertionDelete(scope.$index)">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -457,6 +457,11 @@ export default {
       this.caseForm.extract = JSON.stringify(responseObj)
       // 断言
       this.caseForm.validate = JSON.stringify(this.assertionList)
+      // 输入框验证
+      this.$refs.caseFormRef.validate((valid) => {
+        if (!valid) {
+          return false
+        } else {
           if (this.caseForm.id) {
             // 编辑接口
             editCase(this.caseForm).then((resp) => {
@@ -483,6 +488,8 @@ export default {
               }
             })
           }
+        }
+      })
     },
 
     // 刷新列表

src/views/auto/AddInterface.vue

 <template>
   <div>
-    <el-form ref="interfaceForm" :rules="rules" :model="interfaceForm">
+    <el-form ref="interfaceFormRef" :rules="rules" :model="interfaceForm">
       <el-collapse v-model="activeNames">
         <el-collapse-item name="1" title="基本信息">
           <el-row>
@@ -364,7 +364,10 @@ export default {
       this.interfaceForm.headers = JSON.stringify(this.headersList)
       this.interfaceForm.paramTemplate = JSON.stringify(this.paramList)
       this.interfaceForm.responseTemplate = JSON.stringify(this.responseList)
-
+      this.$refs.interfaceFormRef.validate((valid) => {
+        if (!valid) {
+          return false
+        } else {
           if (this.interfaceForm.id) {
             // 编辑接口
             editInterface(this.interfaceForm).then((resp) => {
@@ -399,6 +402,8 @@ export default {
             })
           }
         }
+      })
+    }
   }
 }
 </script>

src/views/auto/CaseList.vue

@@ -7,8 +7,8 @@
           <el-option v-for="item in modelList" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
         <el-input v-model="queryModuleInfo.testcaseName" clearable placeholder="请输入用例名称" style="width: 300px;"></el-input>
-        <el-button type="primary" style="margin-left:20px" @click="queryData">查询</el-button>
-        <el-button type="primary" style="margin-left:20px" @click="addPage">新增</el-button>
+        <el-button type="primary" style="margin-left:20px" icon="el-icon-search" @click="queryData">查询</el-button>
+        <el-button type="primary" style="margin-left:20px" icon="el-icon-circle-plus" @click="addPage">新增</el-button>
       </div>
       <el-table :data="singleCaseList" border style="width: 100%;margin-top:20px">
         <el-table-column type='index' width="50px"></el-table-column>
@@ -19,9 +19,9 @@
         <!-- <el-table-column prop="updateTime" label="修改日期" width="200px"></el-table-column> -->
         <el-table-column label="操作">
           <slot slot-scope="scope">
-            <el-button type="warning" @click="executeCaseFrom(scope.row)">执行</el-button>
-            <el-button type="success" @click="editCaseFrom(scope.row)">编辑</el-button>
-            <el-button type="danger" @click="delCaseFrom(scope.row)">删除</el-button>
+            <el-button type="warning" icon="el-icon-link" @click="executeCaseFrom(scope.row)">执行</el-button>
+            <el-button type="success"  icon="el-icon-edit" @click="editCaseFrom(scope.row)">编辑</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="delCaseFrom(scope.row)">删除</el-button>
           </slot>
         </el-table-column>
       </el-table>
@@ -180,7 +180,4 @@ export default {
 .el-select {
   margin: 0 10px 0 5px;
 }
-// .el-select {
-//   margin-right: 10px;
-// }
 </style>

src/views/auto/InterfaceList.vue

@@ -26,8 +26,8 @@
         <!-- <el-table-column prop="updateTime" label="修改时间" width="200px"></el-table-column> -->
         <el-table-column label="操作">
           <slot slot-scope="scope">
-            <el-button type="success" @click="editInterfaceFrom(scope.row)">编辑</el-button>
-            <el-button type="danger" @click="delInterfaceFrom(scope.row)">删除</el-button>
+            <el-button type="success" icon="el-icon-edit" @click="editInterfaceFrom(scope.row)">编辑</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="delInterfaceFrom(scope.row)">删除</el-button>
           </slot>
         </el-table-column>
       </el-table>
@@ -174,7 +174,6 @@ export default {
 
 <style lang="less" scoped>
 .el-select {
-  margin-right: 10px;
-  margin-left: 5px;
+   margin: 0 10px 0 5px;
 }
 </style>

src/views/auto/Model.vue → src/views/auto/ModelList.vue

@@ -15,8 +15,8 @@
         <!-- <el-table-column prop="updateTime" label="修改时间" width="200px"></el-table-column> -->
         <el-table-column label="操作">
           <slot slot-scope="scope">
-            <el-button type="success" @click="openEditDialog(scope.row)">编辑</el-button>
-            <el-button type="danger" @click="delModelFrom(scope.row)">删除</el-button>
+            <el-button type="success" icon="el-icon-edit" @click="openEditDialog(scope.row)">编辑</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="delModelFrom(scope.row)">删除</el-button>
           </slot>
         </el-table-column>
       </el-table>

src/views/auto/Project.vue → src/views/auto/ProjectList.vue

@@ -25,8 +25,8 @@
       </el-pagination>
     </el-card>
     <!-- 新增页面 /编辑页面-->
-    <el-dialog title="新增项目" :visible.sync="DialogVisible" width="30%">
-      <el-form ref="projectForm" :rules="rules" :model="projectForm" label-width="90px">
+    <el-dialog title="新增项目" :visible.sync="DialogVisible" @close="closeAddDialog" width="30%">
+      <el-form ref="projectFormRef" :rules="rules" :model="projectForm" label-width="90px">
         <el-form-item label="项目名称:" prop="name" style="width:400px">
           <el-input v-model="projectForm.name"></el-input>
         </el-form-item>
@@ -99,6 +99,10 @@ export default {
     searchMockList() {},
     // 新增确定按钮
     addPojectFrom() {
+      this.$refs.projectFormRef.validate((valid) => {
+        if (!valid) {
+          return false
+        } else {
           if (this.projectForm.id) {
             // 编辑接口
             editProject(this.projectForm)
@@ -126,14 +130,18 @@ export default {
                   this.getProjectList()
                 } else {
                   this.$message.error(resp.data.msg)
-              this.projectForm.name = ''
-              this.projectForm.description = ''
                 }
               })
               .catch((error) => {
                 this.$message({ type: 'error', message: error })
               })
           }
+        }
+      })
+    },
+    // 对话框关闭后清空文本框数据
+    closeAddDialog() {
+      this.$refs.projectFormRef.resetFields()
     },
     // 编辑信息回显
     openEditDialog(row) {

src/views/auto/SceneList.vue

@@ -4,8 +4,8 @@
       <div>
         场景名称：
         <el-input v-model="queryModuleInfo.sceneName" clearable placeholder="请输入场景名称" style="width: 300px;"></el-input>
-        <el-button type="primary" style="margin-left:20px" @click="queryData">查询</el-button>
-        <el-button type="primary" style="margin-left:20px" @click="DialogVisible = true">新增</el-button>
+        <el-button type="primary" style="margin-left:20px" icon="el-icon-search" @click="queryData">查询</el-button>
+        <el-button type="primary" style="margin-left:20px" icon="el-icon-circle-plus" @click="DialogVisible = true">新增</el-button>
       </div>
       <el-table :data="sceneList" border style="width: 100%;margin-top:20px">
         <el-table-column type='index' width="50px"></el-table-column>
@@ -15,9 +15,9 @@
         <!-- <el-table-column prop="updateTime" label="修改时间" width="200px"></el-table-column> -->
         <el-table-column label="操作">
           <slot slot-scope="scope">
-            <el-button type="warning" @click="executeSceneFrom(scope.row)">执行</el-button>
-            <el-button type="success" @click="editeSceneFrom(scope.row)">编辑</el-button>
-            <el-button type="danger" @click="deleSceneFrom(scope.row)">删除</el-button>
+            <el-button type="warning" icon="el-icon-link" @click="executeSceneFrom(scope.row)">执行</el-button>
+            <el-button type="success" icon="el-icon-edit" @click="editeSceneFrom(scope.row)">编辑</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="deleSceneFrom(scope.row)">删除</el-button>
           </slot>
         </el-table-column>
       </el-table>
@@ -36,8 +36,8 @@
       </div>
     </el-card>
     <!-- 新增页面 /编辑页面-->
-    <el-dialog title="新增场景" :visible.sync="DialogVisible" width="50%">
-      <el-form ref="sceneForm" :rules="rules" :model="sceneForm" label-width="90px">
+    <el-dialog title="新增场景" :visible.sync="DialogVisible" width="50%" @close="closeAddDialog">
+      <el-form ref="sceneFormAddRef" :rules="rules" :model="sceneForm" label-width="90px">
         <el-form-item label="场景名称:" prop="name" style="width:400px">
           <el-input v-model="sceneForm.name"></el-input>
         </el-form-item>
@@ -141,7 +141,6 @@ export default {
       this.executeScene.namespace = window.sessionStorage.getItem('env')
       this.isShow = true
       executeScene(this.executeScene).then((resp) => {
-        console.log('接口返回结果', resp)
         this.requestData = resp.data.data
       })
     },
@@ -149,7 +148,6 @@ export default {
     editeSceneFrom(row) {
       window.sessionStorage.setItem('curScene', JSON.stringify(row))
       this.$router.push({ path: 'EditScene' })
-      // this.$router.push({ path: 'tese' })
       // bus使用
       this.$nextTick(function () {
         // DOM 现在更新了
@@ -202,13 +200,15 @@ export default {
         if (resp.data.data === true) {
           this.DialogVisible = false
           this.$message.success('新增成功！')
-          this.sceneForm.name = ''
-          this.sceneForm.projectId = ''
           this.getSecneList()
         } else {
           this.$message.error(resp.data.msg)
         }
       })
+    },
+    // 关闭清空数据
+    closeAddDialog() {
+      this.$refs.sceneFormAddRef.resetFields()
     }
   }
 }

src/views/layout/leftAside/menu.json

@@ -109,13 +109,13 @@
           "id": 1,
           "title": "项目管理",
           "icon": "el-icon-bicycle",
-          "path": "/auto/Project"
+          "path": "/auto/ProjectList"
         },
         {
           "id": 2,
           "title": "模块管理",
           "icon": "el-icon-wallet",
-          "path": "/auto/Model"
+          "path": "/auto/ModelList"
         },
         {
           "id": 3,