qinzhipeng_v 5 năm trước cách đây
mục cha
commit
692037be6f

+ 2 - 2
src/apiConfig/api.js

@@ -1,6 +1,6 @@
 /*eslint-disable*/   //规避eslint的检查,如没有eslint可不写
-// export const mockUrl = 'http://10.179.24.176:8980' // 线下
-export const mockUrl = 'http://10.179.24.123:8980' // 线上
+export const mockUrl = 'http://10.179.24.176:8980' // 线下
+// export const mockUrl = 'http://10.179.24.123:8980' // 线上
 
 // export const mockUrl = 'http://172.23.162.48:8980' // 美双姐本地
 

+ 2 - 2
src/apiConfig/mock.js

@@ -1,4 +1,4 @@
 /*eslint-disable*/   //规避eslint的检查,如没有eslint可不写
-// export const mockUrl = 'http://10.179.88.110:8089' // stable
-export const mockUrl = 'http://mock.Intra.xiaojukeji.com' // 线上
+export const mockUrl = 'http://10.179.88.110:8089' // stable
+// export const mockUrl = 'http://mock.Intra.xiaojukeji.com' // 线上
 // export const mockUrl = 'http://10.179.101.226:8089' // test

+ 26 - 4
src/router/index.js

@@ -92,11 +92,33 @@ export const constantRoutes = [
         meta: { title: '项目管理' }
       },
       {
-        path: 'useCasePage',
-        name: 'useCasePage',
-        hidden: true,
+        path: '/Platform/useCasePage',
+        name: '用例管理',
         component: () => import('@/views/Platform/useCasePage'),
-        meta: { title: '用例管理' }
+        meta: { title: '用例管理' },
+        children: [
+          {
+            path: 'createUse',
+            name: '用例新增',
+            hidden: true,
+            component: () => import('@/views/Platform/useCase/createUse'),
+            meta: { title: '用例新增' }
+          }
+          // {
+          //   path: 'bugQuery',
+          //   name: '查看Bug',
+          //   hidden: true,
+          //   component: () => import('@/views/Platform/bugManage/bugQuery'),
+          //   meta: { title: '查看Bug' }
+          // },
+          // {
+          //   path: 'bugUpdate',
+          //   name: '更新Bug',
+          //   hidden: true,
+          //   component: () => import('@/views/Platform/bugManage/bugUpdate'),
+          //   meta: { title: '更新Bug' }
+          // }
+        ]
       },
       {
         path: '/Platform/presentation',

+ 169 - 0
src/views/Platform/useCase/createUse.vue

@@ -0,0 +1,169 @@
+<template>
+  <div id="window-judge" style="background:#F2F3F6;">
+    <el-container>
+      <el-header style="background:#ffffff;height:auto; width:94%;margin:3%; font-size:14px;border-radius:8px;">
+        <el-form ref="caseData" :model="caseData" label-width="90pt" style="margin:1%;" :rules="createFormData">
+          <el-row>
+            <el-col :span="20">
+              <el-form-item label="前置条件" label-width="80pt" prop="casePriority">
+                <el-input v-model="value" placeholder="请输入内容" style="margin-left:1.3%;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="20">
+              <div style="white-space:nowrap; display:flex;">
+                <el-form-item label="用例优先级" prop="casePriority" style="flex:1">
+                  <el-select v-model="caseData.casePriority" clearable placeholder="用例优先级" style="width: 100%">
+                    <el-option v-for="item in priorityStrings" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="API" prop="api" style="flex:1"><el-input v-model="caseData.api" clearable autocomplete="off" style="width: 100%; margin-left:3%;" /></el-form-item>
+              </div>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-header>
+      <el-main style="background:#ffffff;height:auto; width:94%;margin: 0 3% 3% 3%; font-size:14px;border-radius:8px;">
+        <div style="box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);">
+          <el-form ref="caseData" :model="caseData" label-width="90pt" :rules="createFormData">
+            <el-row>
+              <el-col :span="20" style="margin:2% 0 0 0; white-space:nowrap;">
+                <el-form-item label="执行步骤" prop="casePriority">
+                  <el-input v-model="textarea" type="textarea" :rows="4" placeholder="请输入内容" />
+                  <el-button size="mini" type="primary" icon="el-icon-plus" style="margin-bottom: 6%;" @click="addform" />
+                  <el-button size="mini" icon="el-icon-minus" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="22">
+                <el-form-item label="预期结果" prop="casePriority">
+                  <el-input v-model="textarea" placeholder="请输入内容" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <div style="display:flex;">
+              <el-row style="flex:1;">
+                <el-col :span="22">
+                  <el-form-item label="附件" prop="casePriority">
+                    <el-upload class="upload-demo" drag action="https://jsonplaceholder.typicode.com/posts/" multiple>
+                      <i class="el-icon-upload" />
+                      <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
+                      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div>
+                    </el-upload>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row style="flex:1;">
+                <el-col :span="20">
+                  <el-form-item label="备注" prop="casePriority">
+                    <el-input v-model="textarea" type="textarea" :rows="8" placeholder="请输入内容" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+            <div slot="footer" class="dialog-footer" style="margin-bottom:30%;">
+              <el-button type="primary" @click="dialogFormVisibleUpdate = false">关 闭</el-button>
+              <el-button type="primary" @click="caseCreateCase(caseData, titleName)">确 定</el-button>
+            </div>
+          </el-form>
+        </div>
+      </el-main>
+    </el-container>
+
+  </div>
+</template>
+
+<script>
+import { createFolderData, createCaseData, updateCaseData } from '@/api/caseProject.js'
+
+export default {
+  data() {
+    return {
+      value: '',
+      dialogFormVisibleUpdate: false,
+      caseData: {},
+      createFormData: {
+        caseName: [{ required: true, message: '用例名不能为空', trigger: 'change' }],
+        description: [{ required: true, message: '用例描述不能为空', trigger: 'change' }],
+        expectedResult: [{ required: true, message: '期望结果不能为空', trigger: 'change' }],
+        api: [{ required: true, message: '对应接口不能为空', trigger: 'change' }],
+        projectType: [{ required: true, message: '项目类型不能为空', trigger: 'change' }],
+        taskType: [{ required: true, message: '任务类型不能为空', trigger: 'change' }],
+        casePriority: [{ required: true, message: '用例优先级不能为空', trigger: 'change' }]
+      },
+      textarea: ''
+    }
+  },
+  created() {
+    this.getCreateUseData()
+  },
+  motheds: {
+    getCreateUseData() {
+      if (this.route.query.data) {
+        createFolderData(this.formData).then(res => {
+          if (res.code === 200) {
+            this.centerDialogVisible = false
+            this.successFun()
+            this.createCaseCode = false
+            this.dataShow = true
+            this.data1 = []
+            this.AllQueryFolderData()
+          } else {
+            this.errorFun(res.msg)
+          }
+        })
+      }
+    },
+    caseCreateCase(vel, e) {
+      if (e === '编辑') {
+        updateCaseData(this.caseData).then(res => {
+          this.successFun()
+          this.dialogFormVisibleUpdate = false
+        })
+      }
+      if (vel !== '' && e === '新增') {
+        this.$refs['caseData'].validate((valid) => {
+          if (valid) {
+            this.caseData = vel
+            this.caseData.creator = this.userInformation
+            this.caseData.creatorName = this.userNames
+            this.caseData.modifier = this.userInformation
+            this.caseData.pageSize = 5
+            this.caseData.curIndex = 0
+            this.caseData.caseFolderId = this.startId
+            this.caseData.bizId = this.bizJson
+            createCaseData(this.caseData).then(res => {
+              if (res.code === 200) {
+                this.gridData = res.data
+                this.successFun()
+                this.dialogFormVisibleUpdate = false
+              } else {
+                this.$notify({ title: '提示', message: res.msg, duration: 2000 })
+              }
+            })
+          }
+        })
+      }
+    },
+
+    // 添加事件
+    addform() {
+
+    }
+  }
+}
+</script>
+
+<style>
+.bgColorSz {
+    width: 100%;
+    height: 96vh;
+    background: #F2F3F6;
+    font-size: 0.9rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+</style>

+ 3 - 0
src/views/Platform/useCase/test.vue

@@ -0,0 +1,3 @@
+<template>
+  <router-view />
+</template>

+ 202 - 337
src/views/Platform/useCasePage.vue

@@ -1,343 +1,198 @@
 <template>
-  <div style="background:#F2F3F6">
-    <el-container>
-      <el-header style="background:#ffffff;height:25vh;; width:94%;margin:3%; font-size:14px;">
-        <el-row>
-          <el-col :span="20" style="white-space:nowrap;">
-            前置条件
-            <el-input v-model="value" placeholder="请输入内容" style="margin-top:1.3%;" />
-            <el-button class="headerStyle" style="margin-left:1%;" type="primary" @click="queryCaseData(createParticipation)">查询</el-button>
-            <el-button type="primary" @click="createGetShow">新增</el-button>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="20" style="white-space:nowrap;">
-            <div class="headerStyle" style="margin:1% 0;">
-              <span>优先级</span>
-              <el-select v-model="createParticipation.casePriority" style="width: 20%;margin-right:5px;" clearable placeholder="优先级">
-                <el-option v-for="item in priorityStrings" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-              用例名
-              <el-input v-model="createParticipation.folderName" placeholder="用例名" clearable style="width: 20%;" class="filter-item" />
-              api接口 <el-input v-model="createParticipation.api" placeholder="api接口" clearable style="width: 50%;margin-right:5px;" class="filter-item" />
-
+  <div id="init-window" style="position:relative">
+    <router-view />
+    <div style="position: absolute;width: 100%;">
+      <div style="background:#F2F3F6;">
+        <el-container>
+          <el-aside width="150pt" style="margin:2.5% 0 2.5% 2.5%; border-radius:8px;">
+            <el-dialog title="提示" :visible.sync="centerDialogVisible" width="30%" center>
+              <el-form :model="formData">
+                <el-form-item label="目录名称 :"><el-input v-model="formData.folderName" autocomplete="off" style="width: 280px" /></el-form-item>
+              </el-form>
+              <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="deleteCodeData(formData), centerDialogVisible = false">删除当前目录</el-button>
+                <el-button type="info" @click="createCase(formData)">新增</el-button>
+              </span>
+            </el-dialog>
+            <div v-show="createCaseCode" style="background: #E9EEF3; height:93vh; text-align:center; padding:50% 0;">
+              <p>请先创建任务,再继续·····</p>
+              <el-button type="primary" @click="changeStartId">新 增</el-button>
             </div>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="20" style="white-space:nowrap;">
-            <div class="demonstration headerStyle">创建时间
-              <el-date-picker v-model="createParticipation.createTime" style="width:20%;margin-right:5px;" type="datetime" placeholder="开始日期" /> -
-              <el-date-picker v-model="createParticipation.modifyTime" style="width:20%;margin-right:5px;" type="datetime" placeholder="结束日期" />
-              创建人 <el-input v-model="createParticipation.creator" placeholder="创建人" clearable style="width: 50%;" class="filter-item" />
-              <input id="imFile" ref="imFile" type="file" style="display: none" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" @change="importFile(this)">
+            <el-tree
+              v-show="dataShow"
+              style="background: #fff; height:88vh; padding:15%;"
+              :data="data1"
+              node-key="id"
+              draggable
+              :allow-drop="allowDrop"
+              :allow-drag="allowDrag"
+              @node-drag-start="handleDragStart"
+              @node-drag-enter="handleDragEnter"
+              @node-drag-leave="handleDragLeave"
+              @node-drag-over="handleDragOver"
+              @node-drag-end="handleDragEnd"
+              @node-drop="handleDrop"
+              @node-contextmenu="createUpdate"
+              @node-click="clickFun"
+            />
+          </el-aside>
+          <el-container>
+            <el-header style="background:#ffffff;height:auto; width:94%;margin:3%; font-size:14px;border-radius:8px;">
+              <el-row>
+                <el-col style="white-space:nowrap; display: flex; justify-content: center; align-items: center;margin-top:1.3%;">
+                  前置条件
+                  <el-input v-model="value" placeholder="请输入内容" style="margin-left:1%;" />
+                  <el-button style="margin-left:1%;" type="primary" @click="queryCaseData(createParticipation)">查询</el-button>
+                  <el-button @click="createGetShow">新增</el-button>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col style="white-space:nowrap; display: flex; justify-content: center; align-items: center;margin:1.3% 0;">
+                  用例名<el-input v-model="createParticipation.folderName" placeholder="用例名" clearable style="width: 20%;margin: 0 2.5%;" class="filter-item" />
+                  优先级
+                  <el-select v-model="createParticipation.casePriority" style="width: 20%;margin: 0 2.5%;" clearable placeholder="优先级">
+                    <el-option v-for="item in priorityStrings" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                  api接口 <el-input v-model="createParticipation.api" placeholder="api接口" clearable style="width: 50%;margin-left:2.5%;" class="filter-item" />
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col style="white-space:nowrap; display: flex; justify-content: center; align-items: center;margin-bottom:1%;">
+                  创建时间
+                  <el-date-picker v-model="createParticipation.createTime" style="width:20%;margin: 0 3% 0 1%;" type="datetime" placeholder="开始日期" /> —
+                  <el-date-picker v-model="createParticipation.modifyTime" style="width:22.5%;margin: 0 3%;" type="datetime" placeholder="结束日期" />
+                  操作人 <el-input v-model="createParticipation.modifier" placeholder="创建人" clearable style="width: 50%;margin-left:2.5%;" class="filter-item" />
+                  <input id="imFile" ref="imFile" type="file" style="display: none" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" @change="importFile(this)">
+                </el-col>
+              </el-row>
+            </el-header>
+            <el-main style="background:#ffffff; width:94%;margin:0% 3% 3% 3%; font-size:14px;border-radius:8px;">
+              <el-button type="primary" style="margin-left:1%;width:15%;" @click="uploadFile()">导入</el-button>
+              <el-button style="margin-left:2%;width:15%;" @click="exportExcel">导出</el-button>
+              <el-button style="margin-left:2%;width:15%;" @click="exportExcel">导出模版</el-button>
+              <!-- 主页table -->
+              <el-table :data="gridData" fit height="330vh" tooltip-effect="dark" style="width: 100%" @select-all="clickAllData" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" min-width="55" align="center" @change="clickAllData(gridData)" />
+                <el-table-column prop="id" label="ID" min-width="60px" align="center">
+                  <template slot-scope="scope">{{ scope.row.id }}</template>
+                </el-table-column>
+                <el-table-column prop="caseName" label="用例名" min-width="150" align="center">
+                  <template slot-scope="scope">{{ scope.row.caseName }}</template>
+                </el-table-column>
+                <el-table-column prop="expectedResult" label="期望结果" min-width="150" align="center">
+                  <template slot-scope="scope">{{ scope.row.expectedResult }}</template>
+                </el-table-column>
+                <el-table-column prop="casePriorityName" label="优先级" min-width="80" align="center">
+                  <template slot-scope="scope">{{ scope.row.casePriorityName }}</template>
+                </el-table-column>
+                <el-table-column prop="creatorName" label="创建人" min-width="100" align="center">
+                  <template slot-scope="scope">{{ scope.row.creatorName }}</template>
+                </el-table-column>
+                <el-table-column prop="modifierName" label="修改人" min-width="100" align="center">
+                  <template slot-scope="scope">{{ scope.row.modifierName }}</template>
+                </el-table-column>
+                <el-table-column prop="createTime" label="创建时间" min-width="200" align="center">
+                  <template slot-scope="scope">{{ scope.row.createTime }}</template>
+                </el-table-column>
+                <el-table-column label="操作" min-width="220px" align="center" fixed="right">
+                  <template slot-scope="scope">
+                    <el-button size="mini" type="primary" @click="queryGetShow(gridData)">查看</el-button>
+                    <el-button size="mini" type="primary" @click="updateGetShow(scope.row)">编辑</el-button>
+                    <el-button size="mini" type="primary" @click="deleteCaseData(scope.row.id)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <!-- 导出文件内容 -->
+              <el-table v-show="false" id="out-table" :data="tableData" fit height="570vh" tooltip-effect="dark" style="width: 100%">
+                <el-table-column type="index" prop="ids" label="序号" width="50" />
+                <!-- <el-table-column prop="ids" label="序号" /> -->
+                <el-table-column prop="caseName" label="用例名" />
+                <el-table-column prop="description" label="用例描述" />
+                <el-table-column prop="expectedResult" label="期望结果" />
+                <el-table-column prop="api" label="对应api" />
+                <el-table-column prop="projectTypeName" label="项目类型" />
+                <el-table-column prop="taskTypeName" label="平台类型" />
+                <el-table-column prop="casePriorityName" label="用例优先级" />
+                <el-table-column prop="moduleTypeName" label="模块名" />
+                <el-table-column prop="creatorName" label="创建人" />
+                <el-table-column prop="modifierName" label="修改人" />
+                <el-table-column prop="remark" label="备注" />
+                <el-table-column prop="createTime" label="创建时间" />
+              </el-table>
+              <el-pagination :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+            </el-main>
+          </el-container>
+        </el-container>
 
+        <!-- 新增-编辑 -->
+        <el-dialog :title="titleName" :visible.sync="dialogFormVisibleUpdate" width="80%">
+          <el-form ref="caseData" :model="caseData" label-width="90pt" :rules="createFormData">
+            <div style="display:flex;">
+              <div style="flex:1;">
+                <el-form-item label="用例名" prop="caseName"><el-input v-model="caseData.caseName" clearable autocomplete="off" style="width: 200px" /></el-form-item>
+                <el-form-item label="期望结果" prop="expectedResult"><el-input v-model="caseData.expectedResult" clearable autocomplete="off" style="width: 200px" /></el-form-item>
+                <el-form-item label="对应api" prop="api"><el-input v-model="caseData.api" clearable autocomplete="off" style="width: 200px" /></el-form-item>
+              </div>
+              <div style="flex:1;">
+                <el-form-item label="项目类型" prop="projectType">
+                  <el-select v-model="caseData.projectType" clearable placeholder="项目类型" style="width: 200px">
+                    <el-option v-for="item in projectTypeStrings" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="平台类型" prop="taskType">
+                  <el-select v-model="caseData.taskType" clearable placeholder="任务类型" style="width: 200px" @change="taskTypeChange(caseData.taskType)">
+                    <el-option v-for="item in taskTypeStrings" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="用例优先级" prop="casePriority">
+                  <el-select v-model="caseData.casePriority" clearable placeholder="用例优先级" style="width: 200px">
+                    <el-option v-for="item in priorityStrings" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </div>
+              <div style="flex:1;">
+                <el-form-item v-show="moduleTypeShow" label="模块名" prop="casePriority">
+                  <el-select v-model="caseData.moduleType" clearable placeholder="模块类型" style="width: 200px">
+                    <el-option v-for="item in moduleTypeStr" :key="item.id" :label="item.moduleName" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </div>
             </div>
-          </el-col>
-        </el-row>
-      </el-header>
-      <el-container>
-        <el-aside width="150pt">
-          <el-dialog title="提示" :visible.sync="centerDialogVisible" width="30%" center>
-            <el-form :model="formData">
-              <el-form-item label="目录名称 :"><el-input v-model="formData.folderName" autocomplete="off" style="width: 280px" /></el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="deleteCodeData(formData), centerDialogVisible = false">删除当前目录</el-button>
-              <el-button type="primary" @click="createCase(formData)">新 增</el-button>
-            </span>
-          </el-dialog>
-          <div v-show="createCaseCode" style="background: #E9EEF3; height:93vh; text-align:center; padding:50% 0;">
-            <p>请先创建任务,再继续·····</p>
-            <el-button type="primary" @click="changeStartId">新 增</el-button>
-          </div>
-          <el-tree
-            v-show="dataShow"
-            style="background: #fff; height:93vh; padding:15%;"
-            :data="data1"
-            node-key="id"
-            draggable
-            :allow-drop="allowDrop"
-            :allow-drag="allowDrag"
-            @node-drag-start="handleDragStart"
-            @node-drag-enter="handleDragEnter"
-            @node-drag-leave="handleDragLeave"
-            @node-drag-over="handleDragOver"
-            @node-drag-end="handleDragEnd"
-            @node-drop="handleDrop"
-            @node-contextmenu="createUpdate"
-            @node-click="clickFun"
-          />
-        </el-aside>
-        <el-main>
-          <el-button type="primary" style="margin-left:6%;" @click="uploadFile()">导入</el-button>
-          <el-button class="headerStyle" style="margin-left:6%;" type="primary" @click="exportExcel">导出</el-button>
-          <!-- 主页table -->
-          <el-table :data="gridData" fit height="570vh" tooltip-effect="dark" style="width: 100%" @select-all="clickAllData" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" @change="clickAllData(gridData)" />
-            <el-table-column prop="id" label="ID" width="60px" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.id }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="caseName" label="用例名" width="150" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.caseName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="expectedResult" label="期望结果" width="150" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.expectedResult }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="casePriorityName" label="优先级" width="80" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.casePriorityName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="creatorName" label="创建人" width="100" align="center">
-              <template slot-scope="scope">
-                <el-tag type="success">{{ scope.row.creatorName }}</el-tag>
-                <!-- <span>{{ scope.row.creatorName }}</span> -->
-              </template>
-            </el-table-column>
-            <el-table-column prop="modifierName" label="修改人" width="100" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.modifierName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="createTime" label="创建时间" width="200" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" min-width="220px" align="center" fixed="right">
-              <template slot-scope="scope">
-                <el-button size="mini" type="primary" @click="queryGetShow(gridData)">查看</el-button>
-                <el-button size="mini" type="primary" @click="updateGetShow(scope.row)">编辑</el-button>
-                <el-button size="mini" type="primary" @click="deleteCaseData(scope.row.id)">删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-          <!-- 导出文件内容 -->
-          <el-table v-show="false" id="out-table" :data="tableData" fit height="570vh" tooltip-effect="dark" style="width: 100%">
-            <el-table-column type="index" prop="ids" label="序号" width="50" />
-            <!-- <el-table-column prop="ids" label="序号" /> -->
-            <el-table-column prop="caseName" label="用例名" />
-            <el-table-column prop="description" label="用例描述" />
-            <el-table-column prop="expectedResult" label="期望结果" />
-            <el-table-column prop="api" label="对应api" />
-            <el-table-column prop="projectTypeName" label="项目类型" />
-            <el-table-column prop="taskTypeName" label="平台类型" />
-            <el-table-column prop="casePriorityName" label="用例优先级" />
-            <el-table-column prop="moduleTypeName" label="模块名" />
-            <el-table-column prop="creatorName" label="创建人" />
-            <el-table-column prop="modifierName" label="修改人" />
-            <el-table-column prop="remark" label="备注" />
-            <el-table-column prop="createTime" label="创建时间" />
-          </el-table>
-          <el-pagination :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="100" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-        </el-main>
-      </el-container>
-    </el-container>
-    <el-container>
-      <el-aside width="150pt">
-        <el-dialog title="提示" :visible.sync="centerDialogVisible" width="30%" center>
-          <el-form :model="formData">
-            <el-form-item label="目录名称 :"><el-input v-model="formData.folderName" autocomplete="off" style="width: 280px" /></el-form-item>
+            <el-form-item label="用例描述" prop="description"><el-input v-model="caseData.description" clearable type="textarea" style="width: 95%" :rows="5" placeholder="请输入内容" /></el-form-item>
+            <el-form-item label="备注"><el-input v-model="caseData.remark" clearable type="textarea" style="width: 95%" :rows="5" placeholder="请输入内容" /></el-form-item>
           </el-form>
-          <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="deleteCodeData(formData), centerDialogVisible = false">删除当前目录</el-button>
-            <el-button type="primary" @click="createCase(formData)">新 增</el-button>
-          </span>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="dialogFormVisibleUpdate = false">关 闭</el-button>
+            <el-button type="primary" @click="caseCreateCase(caseData, titleName)">确 定</el-button>
+          </div>
         </el-dialog>
-        <div v-show="createCaseCode" style="background: #E9EEF3; height:93vh; text-align:center; padding:50% 0;">
-          <p>请先创建任务,再继续·····</p>
-          <el-button type="primary" @click="changeStartId">新 增</el-button>
-        </div>
-        <el-tree
-          v-show="dataShow"
-          style="background: #E9EEF3; height:93vh; padding:15%;"
-          :data="data1"
-          node-key="id"
-          draggable
-          :allow-drop="allowDrop"
-          :allow-drag="allowDrag"
-          @node-drag-start="handleDragStart"
-          @node-drag-enter="handleDragEnter"
-          @node-drag-leave="handleDragLeave"
-          @node-drag-over="handleDragOver"
-          @node-drag-end="handleDragEnd"
-          @node-drop="handleDrop"
-          @node-contextmenu="createUpdate"
-          @node-click="clickFun"
-        />
-      </el-aside>
-      <el-container>
-        <el-header style="height: auto; width:100%; font-size:14px; text-align:right">
-          <el-row>
-            <el-col :span="23" style="white-space:nowrap;">
-              <div class="headerStyle">api接口 <el-input v-model="createParticipation.api" placeholder="api接口" clearable style="width: 16.3%;margin-right:5px;" class="filter-item" />
-                优先级
-                <el-select v-model="createParticipation.casePriority" style="width: 20%;margin-right:5px;" clearable placeholder="优先级">
-                  <el-option v-for="item in priorityStrings" :key="item.value" :label="item.name" :value="item.value" />
-                </el-select>
-                用例名
-                <el-input v-model="createParticipation.folderName" placeholder="用例名" clearable style="width: 20%;" class="filter-item" />
-                <el-button class="headerStyle" style="margin-left:6%;" type="primary" @click="exportExcel">导出</el-button>
-                <el-button class="headerStyle" type="primary" @click="queryCaseData(createParticipation)">查询</el-button>
+
+        <el-dialog title="查看" :visible.sync="dialogFormVisibleQuery" width="80%">
+          <el-form ref="caseData" :model="caseData" label-width="90pt">
+            <div style="display:flex;">
+              <div style="flex:1;">
+                <el-form-item label="用例名 :">{{ caseData.caseName }}</el-form-item>
+                <el-form-item label="期望结果 :">{{ caseData.expectedResult }}</el-form-item>
+                <el-form-item label="对应接口 :">{{ caseData.api }}</el-form-item>
               </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="23" style="white-space:nowrap;">
-              <div class="demonstration headerStyle">创建时间
-                <el-date-picker v-model="createParticipation.createTime" style="width:20%;margin-right:5px;" type="datetime" placeholder="开始日期" />-
-                <el-date-picker v-model="createParticipation.modifyTime" style="width:20%;margin-right:5px;" type="datetime" placeholder="结束日期" />
-                创建人 <el-input v-model="createParticipation.creator" placeholder="创建人" clearable style="width: 20%;" class="filter-item" />
-                <input id="imFile" ref="imFile" type="file" style="display: none" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" @change="importFile(this)">
-                <el-button type="primary" style="margin-left:6%;" @click="uploadFile()">导入</el-button>
-                <el-button type="primary" @click="createGetShow">新增</el-button>
+              <div style="flex:1;">
+                <el-form-item label="项目类型 :">{{ caseData.projectTypeName }}</el-form-item>
+                <el-form-item label="任务类型 :">{{ caseData.taskTypeName }}</el-form-item>
+                <el-form-item label="用例优先级 :">{{ caseData.casePriorityName }}</el-form-item>
               </div>
-            </el-col>
-          </el-row>
-        </el-header>
-        <el-main>
-          <!-- 主页table -->
-          <el-table :data="gridData" fit height="570vh" tooltip-effect="dark" style="width: 100%" @select-all="clickAllData" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" @change="clickAllData(gridData)" />
-            <el-table-column prop="id" label="ID" width="60px" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.id }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="caseName" label="用例名" width="150" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.caseName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="expectedResult" label="期望结果" width="150" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.expectedResult }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="casePriorityName" label="优先级" width="80" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.casePriorityName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="creatorName" label="创建人" width="100" align="center">
-              <template slot-scope="scope">
-                <el-tag type="success">{{ scope.row.creatorName }}</el-tag>
-                <!-- <span>{{ scope.row.creatorName }}</span> -->
-              </template>
-            </el-table-column>
-            <el-table-column prop="modifierName" label="修改人" width="100" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.modifierName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="createTime" label="创建时间" width="200" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.createTime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" min-width="220px" align="center" fixed="right">
-              <template slot-scope="scope">
-                <el-button size="mini" type="primary" @click="queryGetShow(gridData)">查看</el-button>
-                <el-button size="mini" type="primary" @click="updateGetShow(scope.row)">编辑</el-button>
-                <el-button size="mini" type="primary" @click="deleteCaseData(scope.row.id)">删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-          <!-- 导出文件内容 -->
-          <el-table v-show="false" id="out-table" :data="tableData" fit height="570vh" tooltip-effect="dark" style="width: 100%">
-            <el-table-column type="index" prop="ids" label="序号" width="50" />
-            <!-- <el-table-column prop="ids" label="序号" /> -->
-            <el-table-column prop="caseName" label="用例名" />
-            <el-table-column prop="description" label="用例描述" />
-            <el-table-column prop="expectedResult" label="期望结果" />
-            <el-table-column prop="api" label="对应api" />
-            <el-table-column prop="projectTypeName" label="项目类型" />
-            <el-table-column prop="taskTypeName" label="平台类型" />
-            <el-table-column prop="casePriorityName" label="用例优先级" />
-            <el-table-column prop="moduleTypeName" label="模块名" />
-            <el-table-column prop="creatorName" label="创建人" />
-            <el-table-column prop="modifierName" label="修改人" />
-            <el-table-column prop="remark" label="备注" />
-            <el-table-column prop="createTime" label="创建时间" />
-          </el-table>
-          <el-pagination :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="100" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-        </el-main>
-      </el-container>
-    </el-container>
-    <!-- 新增-编辑 -->
-    <el-dialog :title="titleName" :visible.sync="dialogFormVisibleUpdate" width="80%">
-      <el-form ref="caseData" :model="caseData" label-width="90pt" :rules="createFormData">
-        <div style="display:flex;">
-          <div style="flex:1;">
-            <el-form-item label="用例名" prop="caseName"><el-input v-model="caseData.caseName" clearable autocomplete="off" style="width: 200px" /></el-form-item>
-            <el-form-item label="期望结果" prop="expectedResult"><el-input v-model="caseData.expectedResult" clearable autocomplete="off" style="width: 200px" /></el-form-item>
-            <el-form-item label="对应api" prop="api"><el-input v-model="caseData.api" clearable autocomplete="off" style="width: 200px" /></el-form-item>
-          </div>
-          <div style="flex:1;">
-            <el-form-item label="项目类型" prop="projectType">
-              <el-select v-model="caseData.projectType" clearable placeholder="项目类型" style="width: 200px">
-                <el-option v-for="item in projectTypeStrings" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="平台类型" prop="taskType">
-              <el-select v-model="caseData.taskType" clearable placeholder="任务类型" style="width: 200px" @change="taskTypeChange(caseData.taskType)">
-                <el-option v-for="item in taskTypeStrings" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="用例优先级" prop="casePriority">
-              <el-select v-model="caseData.casePriority" clearable placeholder="用例优先级" style="width: 200px">
-                <el-option v-for="item in priorityStrings" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </div>
-          <div style="flex:1;">
-            <el-form-item v-show="moduleTypeShow" label="模块名" prop="casePriority">
-              <el-select v-model="caseData.moduleType" clearable placeholder="模块类型" style="width: 200px">
-                <el-option v-for="item in moduleTypeStr" :key="item.id" :label="item.moduleName" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </div>
-        </div>
-        <el-form-item label="用例描述" prop="description"><el-input v-model="caseData.description" clearable type="textarea" style="width: 95%" :rows="5" placeholder="请输入内容" /></el-form-item>
-        <el-form-item label="备注"><el-input v-model="caseData.remark" clearable type="textarea" style="width: 95%" :rows="5" placeholder="请输入内容" /></el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogFormVisibleUpdate = false">关 闭</el-button>
-        <el-button type="primary" @click="caseCreateCase(caseData, titleName)">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog title="查看" :visible.sync="dialogFormVisibleQuery" width="80%">
-      <el-form ref="caseData" :model="caseData" label-width="90pt">
-        <div style="display:flex;">
-          <div style="flex:1;">
-            <el-form-item label="用例名 :">{{ caseData.caseName }}</el-form-item>
-            <el-form-item label="期望结果 :">{{ caseData.expectedResult }}</el-form-item>
-            <el-form-item label="对应接口 :">{{ caseData.api }}</el-form-item>
-          </div>
-          <div style="flex:1;">
-            <el-form-item label="项目类型 :">{{ caseData.projectTypeName }}</el-form-item>
-            <el-form-item label="任务类型 :">{{ caseData.taskTypeName }}</el-form-item>
-            <el-form-item label="用例优先级 :">{{ caseData.casePriorityName }}</el-form-item>
-          </div>
-          <div style="flex:1;">
-            <el-form-item v-show="moduleTypeShow" label="模块类型 :">{{ caseData.moduleTypeName }}</el-form-item>
+              <div style="flex:1;">
+                <el-form-item v-show="moduleTypeShow" label="模块类型 :">{{ caseData.moduleTypeName }}</el-form-item>
+              </div>
+            </div>
+            <el-form-item label="用例描述 :">{{ caseData.description }}</el-form-item>
+            <el-form-item label="备注 :">{{ caseData.remark }}</el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="dialogFormVisibleQuery = false">关 闭</el-button>
           </div>
-        </div>
-        <el-form-item label="用例描述 :">{{ caseData.description }}</el-form-item>
-        <el-form-item label="备注 :">{{ caseData.remark }}</el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogFormVisibleQuery = false">关 闭</el-button>
+        </el-dialog>
       </div>
-    </el-dialog>
+    </div>
   </div>
 </template>
 
@@ -398,6 +253,7 @@ export default {
       pageSize: 5,
       curIndex: 0,
       startId: '',
+      total: 0,
       createParticipation: {},
       moduleTypeStr: [],
       gridData: [],
@@ -430,8 +286,16 @@ export default {
   },
   mounted() {
     this.imFile = document.getElementById('imFile')
+    this.initWindow()
   },
   methods: {
+    initWindow() {
+      if (!document.getElementById('window-judge')) {
+        document.getElementById('init-window').parentNode.style.overflow = 'auto'
+      } else {
+        document.getElementById('init-window').parentNode.style.overflow = 'hidden'
+      }
+    },
     AllQueryFolderData() {
       this.formData = { bizId: this.bizJson }
       queryAllFolderData(this.formData).then(res => {
@@ -591,13 +455,12 @@ export default {
       if (this.startId === '') {
         this.$notify({ title: '提示', message: '请选择目录', duration: 2000 })
       } else {
-        this.dialogFormVisibleUpdate = true
-        // this.caseData = {}
+        // this.$router.push({ name: '用例新增' })
+        this.$router.push({ path: '/Platform/useCasePage/createUse' })
         this.moduleTypeShow = false
-        // this.$refs['caseData'].resetFields()
-        if (this.$refs['caseData'] !== undefined) {
-          this.$refs['caseData'].resetFields()
-        }
+        // if (this.$refs['caseData'] !== undefined) {
+        //   this.$refs['caseData'].resetFields()
+        // }
       }
     },
     // 文件夹新增
@@ -610,6 +473,7 @@ export default {
           creator: this.userInformation,
           modifier: this.userInformation
         }
+
         createFolderData(this.formData).then(res => {
           if (res.code === 200) {
             this.centerDialogVisible = false
@@ -688,7 +552,8 @@ export default {
         caseFolderId: e.id
       }
       queryCasesData(this.formData).then(res => {
-        this.gridData = res.data
+        this.gridData = res.data.list
+        this.total = res.data.total
       })
     },
     deleteCodeData(vel) {