diff --git a/frontend/src/business/components/api/automation/ApiScenarioModule2.vue b/frontend/src/business/components/api/automation/ApiScenarioModule2.vue
deleted file mode 100644
index edbd91f712..0000000000
--- a/frontend/src/business/components/api/automation/ApiScenarioModule2.vue
+++ /dev/null
@@ -1,440 +0,0 @@
-<template>
-  <div>
-    <el-input style="width: 275px;" :placeholder="$t('test_track.module.search')" v-model="filterText"
-              size="small">
-      <template v-slot:append>
-        <el-button icon="el-icon-folder-add" @click="addScenario"/>
-      </template>
-    </el-input>
-
-    <el-tree :data="data"
-             class="filter-tree node-tree"
-             node-key="id"
-             :default-expanded-keys="expandedNode"
-             :expand-on-click-node="false"
-             @node-expand="nodeExpand"
-             @node-collapse="nodeCollapse"
-             @node-click="selectModule"
-             @node-drag-end="handleDragEnd"
-             :filter-node-method="filterNode"
-             draggable
-             :allow-drop="allowDrop"
-             :allow-drag="allowDrag" ref="tree">
-        <span class="custom-tree-node father"
-              slot-scope="{ node, data }">
-          <!-- 如果是编辑状态 -->
-          <template v-if="data.isEdit === 1">
-            <el-input ref="input"
-                      @blur="() => submitEdit(node,data)"
-                      v-model="newLabel"
-                      class="ms-el-input" size="mini"></el-input>
-          </template>
-          <!-- 如果不是编辑状态 -->
-            <i class="el-icon-delete" v-if="data.isEdit!=1 && data.id==='gc'"/>
-            <i class="el-icon-folder" v-if="data.isEdit!=1 && data.id!='gc'"/>
-            <span class="node-title" v-if="data.isEdit!=1" v-text="data.name"></span>
-
-          <span class="node-operate child">
-            <el-tooltip
-              v-if="data.id!=='root' && data.id!=='gc'"
-              class="item"
-              effect="dark"
-              :open-delay="200"
-              :content="$t('test_track.module.rename')"
-              placement="top">
-              <i @click.stop="() => edit(node,data)" class="el-icon-edit"></i>
-            </el-tooltip>
-
-            <el-tooltip
-              v-if="data.id!=='gc'"
-              class="item"
-              effect="dark"
-              :open-delay="200"
-              :content="$t('test_track.module.add_submodule')"
-              placement="top">
-              <i @click.stop="() => append(node,data)" class="el-icon-circle-plus-outline"></i>
-            </el-tooltip>
-
-             <el-tooltip
-               v-if="data.id!=='root' && data.id!=='gc'"
-               class="item"
-               effect="dark"
-               :open-delay="200"
-               :content="$t('commons.delete')"
-               placement="top">
-              <i @click.stop="() => remove(node, data)" class="el-icon-delete"></i>
-            </el-tooltip>
-          </span>
-        </span>
-    </el-tree>
-
-    <ms-add-basis-scenario ref="basisScenario"/>
-  </div>
-
-</template>
-
-<script>
-  import SelectMenu from "../../../track/common/SelectMenu";
-  import MsAddBasisScenario from "@/business/components/api/automation/scenario/AddBasisScenario";
-  import {getCurrentProjectID} from "@/common/js/utils";
-
-  export default {
-    name: 'MsApiScenarioModule',
-    components: {
-      MsAddBasisScenario,
-      SelectMenu,
-    },
-    data() {
-      return {
-        httpVisible: false,
-        expandedNode: [],
-        filterText: "",
-        nextFlag: true,
-        currentModule: {},
-        newLabel: "",
-        data: [{
-          "id": "gc",
-          "name": "回收站",
-          "level": 1,
-          "children": [],
-        }, {
-          "id": "root",
-          "name": "默认模块",
-          "level": 0,
-          "children": [],
-        }]
-      }
-    },
-    mounted() {
-      this.changeProtocol();
-    },
-    watch: {
-      filterText(val) {
-        this.$refs.tree.filter(val);
-      }
-    },
-    methods: {
-      getApiModuleTree() {
-        this.nextFlag = true;
-        let projectId = getCurrentProjectID();
-        if (projectId) {
-          if (this.expandedNode.length === 0) {
-            this.expandedNode.push("root");
-          }
-          this.$get("/api/automation/module/list/" + projectId, response => {
-            if (response.data !== undefined && response.data !== null) {
-              this.data[1].children = response.data;
-              let moduleOptions = [];
-              this.data[1].children.forEach(node => {
-                this.buildNodePath(node, {path: ''}, moduleOptions);
-              });
-              this.$emit('getApiModuleTree', moduleOptions);
-            }
-          });
-        }
-      },
-      buildNodePath(node, option, moduleOptions) {
-        //递归构建节点路径
-        option.id = node.id;
-        option.path = option.path + '/' + node.name;
-        node.path = option.path;
-        moduleOptions.push(option);
-        if (node.children) {
-          for (let i = 0; i < node.children.length; i++) {
-            this.buildNodePath(node.children[i], {path: option.path}, moduleOptions);
-          }
-        }
-      },
-      findTreeByNodeId(rootNode, nodeId) {
-        if (rootNode.id === nodeId) {
-          return rootNode;
-        }
-        if (rootNode.children) {
-          for (let i = 0; i < rootNode.children.length; i++) {
-            if (this.findTreeByNodeId(rootNode.children[i], nodeId)) {
-              return rootNode;
-            }
-          }
-        }
-      },
-      buildParam(draggingNode, dropNode, dropType) {
-        let param = {};
-        param.id = draggingNode.data.id;
-        param.name = draggingNode.data.name;
-        param.projectId = draggingNode.data.projectId;
-        if (dropType === "inner") {
-          param.parentId = dropNode.data.id;
-          param.level = dropNode.data.level;
-        } else {
-          if (!dropNode.parent.id || dropNode.parent.id === 0) {
-            param.parentId = 0;
-            param.level = 1;
-          } else {
-            param.parentId = dropNode.parent.data.id;
-            param.level = dropNode.parent.data.level;
-          }
-        }
-        let nodeIds = [];
-        this.getChildNodeId(draggingNode.data, nodeIds);
-        if (dropNode.level === 1 && dropType !== "inner") {
-          param.nodeTree = draggingNode.data;
-        } else {
-          for (let i = 0; i < this.data.length; i++) {
-            param.nodeTree = this.findTreeByNodeId(this.data[i], dropNode.data.id);
-            if (param.nodeTree) {
-              break;
-            }
-          }
-        }
-        param.nodeIds = nodeIds;
-        return param;
-      },
-      getTreeNode(nodes, id, list) {
-        if (!nodes) {
-          return;
-        }
-        for (let i = 0; i < nodes.length; i++) {
-          if (nodes[i].id === id) {
-            i - 1 >= 0 ? list[0] = nodes[i - 1].id : list[0] = "";
-            list[1] = nodes[i].id;
-            i + 1 < nodes.length ? list[2] = nodes[i + 1].id : list[2] = "";
-            return;
-          }
-          if (nodes[i].children) {
-            this.getTreeNode(nodes[i].children, id, list);
-          }
-        }
-      },
-      handleDragEnd(draggingNode, dropNode, dropType) {
-        if (dropNode.data.id === "root" || dropType === "none" || dropType === undefined) {
-          return;
-        }
-        let param = this.buildParam(draggingNode, dropNode, dropType);
-
-        this.list = [];
-        if (param.parentId === "root") {
-          param.parentId = null;
-        }
-        this.getTreeNode(this.data, draggingNode.data.id, this.list);
-
-        this.$post("/api/automation/module/drag", param, () => {
-          this.getApiModuleTree();
-        }, () => {
-          this.getApiModuleTree();
-        });
-      },
-
-      allowDrop(draggingNode, dropNode) {
-        return dropNode.data.id !== "root";
-      },
-      allowDrag(draggingNode) {
-        // 顶层默认分组不允许拖拽
-        return draggingNode.data.id !== "root";
-      },
-      append(node, data) {
-        if (this.nextFlag === true) {
-          const newChild = {
-            id: "newId",
-            isEdit: 0,
-            name: "",
-            children: []
-          }
-          if (!data.children) {
-            this.$set(data, 'children', [])
-          }
-          this.nextFlag = false;
-          data.children.push(newChild)
-          this.edit(node, newChild);
-        } else {
-          this.$message.warning(this.$t('commons.please_save'));
-        }
-      },
-
-      remove(node, data) {
-        if (data.name === "") {
-          this.nextFlag = true;
-        }
-        let delIds = [];
-        this.getChildNodeId(data, delIds);
-        delIds.push(data.id);
-        this.$post("/api/automation/module/delete", delIds, () => {
-          this.$success(this.$t('commons.save_success'));
-          // 移除节点
-          const parent = node.parent
-          const children = parent.data.children || parent.data
-          const index = children.findIndex(d => d.id !== undefined && data.id !== undefined && d.id === data.id)
-          children.splice(index, 1);
-          this.getApiModuleTree();
-        });
-      },
-
-      edit(node, data) {
-        this.$set(data, 'isEdit', 1)
-        this.newLabel = data.name
-        this.$nextTick(() => {
-        })
-      },
-
-      submitEdit(node, data) {
-        // 触发了保存按钮
-        if (this.newLabel === "") {
-          this.nextFlag = false;
-          this.$message.warning(this.$t('commons.input_name'));
-          return;
-        }
-
-        this.$set(data, 'name', this.newLabel)
-        let flag = this.editApiModule(node, data);
-        if (flag === false) {
-          this.$set(data, 'isEdit', 1)
-          return;
-        }
-        this.$set(data, 'isEdit', 0)
-        this.newLabel = ""
-        this.nextFlag = true;
-      },
-
-      cancelEdit(node, data) {
-        this.newLabel = ""
-        this.$set(data, 'isEdit', 0)
-      },
-
-      getChildNodeId(rootNode, nodeIds) {
-        //递归获取所有子节点ID
-        nodeIds.push(rootNode.id);
-        this.nodePath += rootNode.name + "/";
-        if (rootNode.children) {
-          for (let i = 0; i < rootNode.children.length; i++) {
-            this.getChildNodeId(rootNode.children[i], nodeIds);
-          }
-        }
-      },
-      // 保存或修改
-      editApiModule(node, data) {
-        let projectId = getCurrentProjectID();
-        if (!projectId) {
-          this.$error(this.$t('api_test.select_project'));
-          return;
-        }
-        let url = "";
-        if (data.id === "newId") {
-          url = '/api/automation/module/add';
-          data.level = 1;
-          if (node.parent && node.parent.key !== "root") {
-            data.parentId = node.parent.key;
-            data.level = node.parent.level;
-          }
-        } else {
-          url = '/api/automation/module/edit';
-          let ids = [];
-          this.getChildNodeId(data, ids);
-          data.nodeIds = ids;
-        }
-        data.protocol = this.protocol;
-        data.projectId = projectId;
-        this.$post(url, data, () => {
-          this.$success(this.$t('commons.save_success'));
-          this.getApiModuleTree();
-          this.nextFlag = true;
-          return true;
-        });
-        return false;
-      },
-
-      selectModule(data) {
-        if (data.id !== "root") {
-          if (data.path !== undefined && !data.path.startsWith("/")) {
-            data.path = "/" + data.path;
-          }
-          if (data.path !== undefined && data.path.endsWith("/")) {
-            data.path = data.path.substr(0, data.path.length - 1);
-          }
-          let nodeIds = [];
-          this.getChildNodeId(data, nodeIds);
-          data.ids = nodeIds;
-          this.currentModule = data;
-        }
-        this.$emit('selectModule', data);
-      },
-      refresh(data) {
-        this.$emit('refresh', data);
-      },
-      saveAsEdit(data) {
-        this.$emit('saveAsEdit', data);
-      },
-      filterNode(value, data) {
-        if (!value) return true;
-        return data.name.indexOf(value) !== -1;
-      },
-      addScenario() {
-        this.$refs.basisScenario.open(this.currentModule);
-      },
-      nodeExpand(data) {
-        if (data.id) {
-          this.expandedNode.push(data.id);
-        }
-      },
-      nodeCollapse(data) {
-        if (data.id) {
-          this.expandedNode.splice(this.expandedNode.indexOf(data.id), 1);
-        }
-      },
-      changeProtocol() {
-        this.getApiModuleTree();
-        this.$emit('changeProtocol', this.protocol);
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  .node-tree {
-    margin-top: 15px;
-    margin-bottom: 15px;
-  }
-
-  .ms-el-input {
-    height: 25px;
-    line-height: 25px;
-  }
-
-  .custom-tree-node {
-    flex: 1 1 auto;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 14px;
-    padding-right: 8px;
-    width: 100%;
-  }
-
-  .father .child {
-    display: none;
-  }
-
-  .father:hover .child {
-    display: block;
-  }
-
-  .node-title {
-    width: 0;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    flex: 1 1 auto;
-    padding: 0 5px;
-    overflow: hidden;
-  }
-
-  .node-operate > i {
-    color: #409eff;
-    margin: 0 5px;
-  }
-
-  /deep/ .el-tree-node__content {
-    height: 33px;
-  }
-
-  .ms-api-buttion {
-    width: 30px;
-  }
-</style>
diff --git a/frontend/src/business/components/api/automation/report/components/RequestResult.vue b/frontend/src/business/components/api/automation/report/components/RequestResult.vue
index 81c067ed34..6631e69395 100644
--- a/frontend/src/business/components/api/automation/report/components/RequestResult.vue
+++ b/frontend/src/business/components/api/automation/report/components/RequestResult.vue
@@ -67,6 +67,7 @@
     methods: {
       active() {
         this.isActive = !this.isActive;
+        console.log(this.request)
         //this.$emit("requestResult", {request: this.request, scenarioName: this.scenarioName});
       }
     },
diff --git a/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue b/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue
index 97ed21bb7b..cbc5a58c8f 100644
--- a/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue
+++ b/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue
@@ -41,7 +41,7 @@
       <div v-show="isActive">
         <el-tabs v-model="activeName" v-show="isActive" v-if="hasSub">
           <el-tab-pane :label="$t('api_report.sub_result')" name="sub">
-            <ms-request-result class="sub-result" v-for="(sub, index) in request.subRequestResults"
+            <ms-request-sub-result class="sub-result" v-for="(sub, index) in request.subRequestResults"
                                :key="index" :request="sub"/>
           </el-tab-pane>
           <el-tab-pane :label="$t('api_report.request_result')" name="result">
@@ -68,10 +68,11 @@
   import MsRequestText from "./RequestText";
   import MsResponseText from "./ResponseText";
   import MsRequestResult from "./RequestResult";
+  import MsRequestSubResult from "./RequestSubResult";
 
   export default {
     name: "MsRequestResultTail",
-    components: {MsResponseText, MsRequestText, MsAssertionResults, MsRequestMetric, MsRequestResult},
+    components: {MsResponseText, MsRequestText, MsAssertionResults, MsRequestMetric, MsRequestResult,MsRequestSubResult},
     props: {
       request: Object,
       scenarioName: String,
diff --git a/frontend/src/business/components/api/automation/report/components/RequestSubResult.vue b/frontend/src/business/components/api/automation/report/components/RequestSubResult.vue
new file mode 100644
index 0000000000..b65bc1afd4
--- /dev/null
+++ b/frontend/src/business/components/api/automation/report/components/RequestSubResult.vue
@@ -0,0 +1,144 @@
+<template>
+  <div class="request-result">
+    <p class="el-divider--horizontal"></p>
+    <div @click="active">
+      <el-row :gutter="10" type="flex" align="middle" class="info">
+        <el-col :span="14" v-if="indexNumber!=undefined">
+          <div class="method">
+            <div class="el-step__icon is-text ms-api-col" v-if="indexNumber%2 ==0">
+              <div class="el-step__icon-inner"> {{ indexNumber+1 }}</div>
+            </div>
+            <div class="el-step__icon is-text ms-api-col-create" v-else>
+              <div class="el-step__icon-inner"> {{ indexNumber+1 }}</div>
+            </div>
+            {{ request.name }}
+          </div>
+        </el-col>
+
+        <el-col :span="5">
+          <el-tooltip effect="dark" :content="request.responseResult.responseCode" placement="bottom" :open-delay="800">
+            <div class="url" style="color: #5daf34">{{ request.responseResult.responseCode }}</div>
+          </el-tooltip>
+        </el-col>
+        <el-col :span="3">
+          {{request.responseResult.responseTime}} ms
+        </el-col>
+
+        <el-col :span="2">
+          <div class="success">
+            <el-tag size="mini" type="success" v-if="request.success">
+              {{ $t('api_report.success') }}
+            </el-tag>
+            <el-tag size="mini" type="danger" v-else>
+              {{ $t('api_report.fail') }}
+            </el-tag>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import MsRequestMetric from "./RequestMetric";
+  import MsAssertionResults from "./AssertionResults";
+  import MsRequestText from "./RequestText";
+  import MsResponseText from "./ResponseText";
+
+  export default {
+    name: "MsRequestResult",
+    components: {MsResponseText, MsRequestText, MsAssertionResults, MsRequestMetric},
+    props: {
+      request: Object,
+      scenarioName: String,
+      indexNumber: Number,
+    },
+    data() {
+      return {isActive: false, requestType: undefined,}
+    },
+    methods: {
+      active() {
+        this.isActive = !this.isActive;
+        console.log(this.request)
+        //this.$emit("requestResult", {request: this.request, scenarioName: this.scenarioName});
+      }
+    },
+  }
+</script>
+
+<style scoped>
+  .request-result {
+    width: 100%;
+    min-height: 40px;
+    padding: 2px 0;
+  }
+
+  .request-result .info {
+    margin-left: 20px;
+    cursor: pointer;
+  }
+
+  .request-result .method {
+    color: #1E90FF;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 40px;
+    padding-left: 5px;
+  }
+
+  .request-result .url {
+    color: #7f7f7f;
+    font-size: 12px;
+    font-weight: 400;
+    margin-top: 4px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all;
+  }
+
+  .request-result .tab .el-tabs__header {
+    margin: 0;
+  }
+
+  .request-result .text {
+    height: 300px;
+    overflow-y: auto;
+  }
+
+  .sub-result .info {
+    background-color: #FFF;
+  }
+
+  .sub-result .method {
+    border-left: 5px solid #1E90FF;
+    padding-left: 20px;
+  }
+
+  .sub-result:last-child {
+    border-bottom: 1px solid #EBEEF5;
+  }
+
+  .ms-api-col {
+    background-color: #EFF0F0;
+    border-color: #EFF0F0;
+    margin-right: 10px;
+    font-size: 12px;
+    color: #64666A;
+  }
+
+  .ms-api-col-create {
+    background-color: #EBF2F2;
+    border-color: #008080;
+    margin-right: 10px;
+    font-size: 12px;
+    color: #008080;
+  }
+
+  .el-divider--horizontal {
+    margin: 2px 0;
+    background: 0 0;
+    border-top: 1px solid #e8eaec;
+  }
+
+</style>
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
index 9ef68f1538..04e99426e2 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
@@ -47,23 +47,6 @@
     },
     data() {
       return {
-        // httpVisible: false,
-        // expandedNode: [],
-        // filterText: "",
-        // nextFlag: true,
-        // currentModule: {},
-        // newLabel: "",
-        // data: [{
-        //   "id": "gc",
-        //   "name": "回收站",
-        //   "level": 1,
-        //   "children": [],
-        // }, {
-        //   "id": "root",
-        //   "name": "默认模块",
-        //   "level": 0,
-        //   "children": [],
-        // }]
         result: {},
         condition: {
           filterText: "",
diff --git a/frontend/src/business/components/api/definition/model/JsonData.js b/frontend/src/business/components/api/definition/model/JsonData.js
index 60c3d8b8fb..9a1f8d2d1d 100644
--- a/frontend/src/business/components/api/definition/model/JsonData.js
+++ b/frontend/src/business/components/api/definition/model/JsonData.js
@@ -20,7 +20,7 @@ export const DEFAULT_DATA = [{
   "children": [],
 },{
   "id": "root",
-  "name": "默认模块",
+  "name": "全部模块",
   "level": 0,
   "children": [],
 }]