Procházet zdrojové kódy

工作管理名称修改

zhangliang2 před 2 roky
rodič
revize
9ff7e42790

+ 24 - 24
src/api/workManagement.js

@@ -1,32 +1,32 @@
 const basePart = '/simulation/resource/server';
 
-const addOrUpdateProject = basePart + '/simulationProject/addOrUpdateProject'; // 创建或保存手动运行项目详情
-const selectProjectById = basePart + '/simulationProject/selectProjectById'; // 查询手动运行项目详情
-const selectDropDownByType = basePart + '/simulationProject/selectDropDownByType'; // 手动运行项目详情中的下拉列表
-const selectMaxParallelism = basePart + '/simulationProject/selectMaxParallelism'; // 手动运行项目详情中获取人员可用并行数
-const updateProjectNowRunState = basePart + '/simulationProject/updateProjectNowRunState'; // 手动运行项目详情中修改工作运行状态
-
-const selectProject = basePart + '/simulationProject/selectProject'; // 手动运行项目列表
-const deleteProjectByids = basePart + '/simulationProject/deleteProjectByids'; // 删除手动运行项目
+const addOrUpdateProject = basePart + '/simulationProject/addOrUpdateProject'; // 创建或保存标准化测试详情
+const selectProjectById = basePart + '/simulationProject/selectProjectById'; // 查询标准化测试详情
+const selectDropDownByType = basePart + '/simulationProject/selectDropDownByType'; // 标准化测试详情中的下拉列表
+const selectMaxParallelism = basePart + '/simulationProject/selectMaxParallelism'; // 标准化测试详情中获取人员可用并行数
+const updateProjectNowRunState = basePart + '/simulationProject/updateProjectNowRunState'; // 标准化测试详情中修改工作运行状态
+
+const selectProject = basePart + '/simulationProject/selectProject'; // 标准化测试列表
+const deleteProjectByids = basePart + '/simulationProject/deleteProjectByids'; // 删除标准化测试
 const exportProjectReportAndTaskFileById = basePart + '/simulationProject/exportProjectReportAndTaskFileById'; // 导出报告和任务包
 const exportProjectTaskFileById = basePart + '/simulationProject/exportProjectTaskFileById'; // 导出任务包
 
-const selectProjectDetailsById = basePart + '/simulationProject/selectProjectDetailsById'; // 获取手动运行项目工作详情
-const selectProjectTaskList = basePart + '/simulationProject/selectProjectTaskList'; // 获取手动运行项目工作详情-任务列表
-const selectProjectReportById = basePart + '/simulationProject/selectProjectReportById'; // 获取手动运行项目工作详情-测试报告
-const selectProjectTaskById = basePart + '/simulationProject/selectProjectTaskById'; // 获取手动运行项目工作详情-任务详情
-const exportProjectReportById = basePart + '/simulationProject/exportProjectReportById'; // 获取手动运行项目工作详情-下载测试报告
-
-const selectAutomaticProject = basePart + '/simulationProject/selectAutomaticProject'; // 自动运行项目列表
-const addOrUpdateAutomaticProject = basePart + '/simulationProject/addOrUpdateAutomaticProject'; // 添加/编辑自动运行任务
-const updateAutomaticRunState = basePart + '/simulationProject/updateAutomaticRunState'; // 修改自动运行主任务状态
-const selectAutomaticProjectById = basePart + '/simulationProject/selectAutomaticProjectById'; // 根据id查询自动运行项目信息
-const selectSubProjectInfo = basePart + '/simulationProject/selectSubProjectInfo'; // 查询自动运行子工作信息
-const selectSubProjectList = basePart + '/simulationProject/selectSubProjectList'; // 查询自动运行子工作列表
-const createAutomaticSubProject = basePart + '/simulationProject/createAutomaticSubProject'; // 手动运行自动项目
-const deleteAutomaticProjectByids = basePart + '/simulationProject/deleteAutomaticProjectByids'; // 删除自动运行主任务
-const deleteAutomaticSubProjectByIds = basePart + '/simulationProject/deleteAutomaticSubProjectByIds'; // 删除自动运行子任务
-const updateAutoProjectNowRunState = basePart + '/simulationProject/updateAutoProjectNowRunState'; // 修改自动运行子任务状态
+const selectProjectDetailsById = basePart + '/simulationProject/selectProjectDetailsById'; // 获取标准化测试工作详情
+const selectProjectTaskList = basePart + '/simulationProject/selectProjectTaskList'; // 获取标准化测试工作详情-任务列表
+const selectProjectReportById = basePart + '/simulationProject/selectProjectReportById'; // 获取标准化测试工作详情-测试报告
+const selectProjectTaskById = basePart + '/simulationProject/selectProjectTaskById'; // 获取标准化测试工作详情-任务详情
+const exportProjectReportById = basePart + '/simulationProject/exportProjectReportById'; // 获取标准化测试工作详情-下载测试报告
+
+const selectAutomaticProject = basePart + '/simulationProject/selectAutomaticProject'; // 自动化测试列表
+const addOrUpdateAutomaticProject = basePart + '/simulationProject/addOrUpdateAutomaticProject'; // 添加/编辑自动化测试任务
+const updateAutomaticRunState = basePart + '/simulationProject/updateAutomaticRunState'; // 修改自动化测试主任务状态
+const selectAutomaticProjectById = basePart + '/simulationProject/selectAutomaticProjectById'; // 根据id查询自动化测试信息
+const selectSubProjectInfo = basePart + '/simulationProject/selectSubProjectInfo'; // 查询自动化测试子工作信息
+const selectSubProjectList = basePart + '/simulationProject/selectSubProjectList'; // 查询自动化测试子工作列表
+const createAutomaticSubProject = basePart + '/simulationProject/createAutomaticSubProject'; // 手动运行自动化测试项目
+const deleteAutomaticProjectByids = basePart + '/simulationProject/deleteAutomaticProjectByids'; // 删除自动化测试主任务
+const deleteAutomaticSubProjectByIds = basePart + '/simulationProject/deleteAutomaticSubProjectByIds'; // 删除自动化测试子任务
+const updateAutoProjectNowRunState = basePart + '/simulationProject/updateAutoProjectNowRunState'; // 修改自动化测试子任务状态
 
 
 export default {

+ 1 - 1
src/components/echarts/pieChartProjectInfo.vue

@@ -6,7 +6,7 @@
 //import  from '';
 
 export default {
-    name: "pieChartProjectInfo", // 手动运行项目详情-饼图
+    name: "pieChartProjectInfo", // 标准化测试详情-饼图
     components: {},
     data() {
         return {

+ 6 - 5
src/router/workManagement.js

@@ -2,7 +2,7 @@ export default [{
         path: "/manualRunProjectList",
         name: "manualRunProjectList",
         meta: {
-            tabname: "手动运行项目列表",
+            tabname: "标准化测试",
             menuKind: "workManagement",
             login: true
         },
@@ -43,17 +43,18 @@ export default [{
         path: "/manualRunProjectDetail",
         name: "manualRunProjectDetail",
         meta: {
-            tabname: "手动运行项目",
+            tabname: "标准化测试详情",
             menuKind: "workManagement",
             login: true
         },
         component: () => import("@/views/workManagement/manualRunProjectDetail")
     },
+
     {
         path: "/autoRunProjectList",
         name: "autoRunProjectList",
         meta: {
-            tabname: "自动运行项目列表",
+            tabname: "自动化测试",
             menuKind: "workManagement",
             login: true
         },
@@ -62,7 +63,7 @@ export default [{
             path: "autoRunSubProjectList",
             name: "autoRunSubProjectList",
             meta: {
-                tabname: "自动运行子项目列表",
+                tabname: "自动化测试子项目",
                 menuKind: "workManagement",
                 login: true
             },
@@ -104,7 +105,7 @@ export default [{
         path: "/autoRunProjectDetail",
         name: "autoRunProjectDetail",
         meta: {
-            tabname: "自动运行项目",
+            tabname: "自动化测试详情",
             menuKind: "workManagement",
             login: true
         },

+ 1 - 1
src/views/page/pageMenu.vue

@@ -140,7 +140,7 @@
                             <span>工作管理</span>
                         </template>
                         <el-menu-item index="/manualRunProjectList"
-                            >手动运行项目</el-menu-item
+                            >标准化测试</el-menu-item
                         >
                     </el-submenu>
                     <el-submenu :index="menus[5]">

+ 13 - 1
src/views/workManagement/autoRunProjectDetail.vue

@@ -190,7 +190,7 @@ let validateNumB = (rule, value, callback) => {
 };
 
 export default {
-    name: "autoRunProjectDetail", // 自动运行项目详情
+    name: "autoRunProjectDetail", // 自动化测试详情
     components: {},
     data() {
         return {
@@ -271,10 +271,22 @@ export default {
                 if (res.code == 200 && res.info) {
                     res.info.forEach((item) => {
                         if (item.type === "1") {
+                            item.dropDownList.forEach((i) => {
+                                if (i.share === "1") i.name = i.name + "(公有)";
+                            });
+
                             this.algorithmList = item.dropDownList;
                         } else if (item.type === "2") {
+                            item.dropDownList.forEach((i) => {
+                                if (i.share === "1") i.name = i.name + "(公有)";
+                            });
+
                             this.vehicleList = item.dropDownList;
                         } else if (item.type === "3") {
+                            item.dropDownList.forEach((i) => {
+                                if (i.share === "1") i.name = i.name + "(公有)";
+                            });
+
                             this.sceneList = item.dropDownList;
                         }
                         // 空表示第一次进,有值表示在切换算法来源,需要清空选择算法的值

+ 8 - 2
src/views/workManagement/autoRunSubProjectList.vue

@@ -114,7 +114,7 @@
 import tableList from "@/components/grid/TableList";
 
 export default {
-    name: "autoRunSubProjectList", // 自动运行子项目列表
+    name: "autoRunSubProjectList", // 自动化测试子项目列表
     components: { tableList },
     data() {
         return {
@@ -347,7 +347,10 @@ export default {
     },
 
     mounted() {
-        if (this.$route.query.id) {
+        if (
+            this.$route.name === "autoRunSubProjectList" &&
+            this.$route.query.id
+        ) {
             this.id = this.$route.query.id;
 
             if (this.id) {
@@ -367,6 +370,9 @@ export default {
             }
         }
     },
+    // activated() {
+    //     console.log(6);
+    // },
 };
 </script>
 

+ 13 - 1
src/views/workManagement/manualRunProjectDetail.vue

@@ -166,7 +166,7 @@ let validateNumB = (rule, value, callback) => {
 };
 
 export default {
-    name: "manualRunProjectDetail", // 手动运行项目详情
+    name: "manualRunProjectDetail", // 标准化测试详情
     components: {},
     data() {
         return {
@@ -247,10 +247,22 @@ export default {
                 if (res.code == 200 && res.info) {
                     res.info.forEach((item) => {
                         if (item.type === "1") {
+                            item.dropDownList.forEach((i) => {
+                                if (i.share === "1") i.name = i.name + "(公有)";
+                            });
+
                             this.algorithmList = item.dropDownList;
                         } else if (item.type === "2") {
+                            item.dropDownList.forEach((i) => {
+                                if (i.share === "1") i.name = i.name + "(公有)";
+                            });
+
                             this.vehicleList = item.dropDownList;
                         } else if (item.type === "3") {
+                            item.dropDownList.forEach((i) => {
+                                if (i.share === "1") i.name = i.name + "(公有)";
+                            });
+
                             this.sceneList = item.dropDownList;
                         }
                         // 空表示第一次进,有值表示在切换算法来源,需要清空选择算法的值