工作管理联调

src/api/workManagement.js

@@ -9,6 +9,12 @@ const updateProjectNowRunState = basePart + '/simulationProject/updateProjectNow
 const selectProject = basePart + '/simulationProject/selectProject'; // 手动运行项目列表
 const deleteProjectByids = basePart + '/simulationProject/deleteProjectByids'; // 删除手动运行项目
 
+const selectProjectDetailsById = basePart + '/simulationProject/selectProjectDetailsById'; // 获取手动运行项目工作详情
+const selectProjectTaskList = basePart + '/simulationProject/selectProjectTaskList'; // 获取手动运行项目工作详情-任务列表
+const selectProjectReportById = basePart + '/simulationProject/selectProjectReportById'; // 获取手动运行项目工作详情-测试报告
+
+
+
 export default {
     addOrUpdateProject,
     selectProjectById,
@@ -17,5 +23,9 @@ export default {
     updateProjectNowRunState,
 
     selectProject,
-    deleteProjectByids
+    deleteProjectByids,
+
+    selectProjectDetailsById,
+    selectProjectTaskList,
+    selectProjectReportById
 }

src/views/algorithmsLibrary/algorithmsLibraryList.vue

@@ -75,6 +75,7 @@
             :columns="columns"
             :getDataWay="getDataWay"
             :pagination="pagination"
+            index
         >
             <el-table-column label="操作" slot="cgInfos" align="center">
                 <template v-slot="scope">

src/views/modelLibrary/components/handleConfigList.vue

@@ -452,7 +452,6 @@ export default {
             display: inline-block;
             width: 18px;
             height: 18px;
-
             background-size: contain;
         }
     }

src/views/modelLibrary/vehicleConfigurationList.vue

@@ -86,6 +86,7 @@
             :columns="columns"
             :getDataWay="getDataWay"
             :pagination="pagination"
+            index
         >
             <el-table-column label="操作" slot="cgInfos" align="center">
                 <template v-slot="scope">

src/views/page/pageMenu.vue

@@ -159,7 +159,7 @@ export default {
     created() {
         localStorage.setItem(
             "Authorization",
-            "Bearer fd135698-d12d-43de-b923-1585c2a3d07c"
+            "Bearer 937e4938-e476-4fbd-912e-823badc0c787"
         );
         // document.cookie = 'Authorization=Bearer 52de2c22-c2f9-4307-b49d-5b5593792352'
         // console.log(this.$route);
@@ -311,12 +311,21 @@ export default {
 
     /deep/ .el-submenu__title,
     .el-menu-item {
-        color: #ffffff;
+        color: #D7E7FE;
+
+        &.is-active {
+            color: #ffffff;
+            font-weight: bold;
+        }
     }
 
     /deep/ .el-submenu__title {
         padding-left: 15px !important;
         padding-right: 10px;
+
+        span {
+            color: #ffffff;
+        }
     }
 
     /deep/ .el-submenu__icon-arrow {

src/views/workManagement/evaluationReport.vue

@@ -5,28 +5,24 @@
             <div class="evaluationBox">
                 <div class="box">
                     <span>算法名称:</span>
-                    <b>塞德里克福建省李逵负荆</b>
+                    <b>{{ info.algorithmName }}</b>
                 </div>
                 <div class="box">
                     <span>算法得分:</span>
-                    <b>90</b>
+                    <b>{{ info.algorithmScore }}</b>
                 </div>
                 <div class="box">
                     <span>测试等级:</span>
-                    <b>优秀</b>
+                    <b>{{ info.evaluationLevel }}</b>
                 </div>
             </div>
             <div class="desBox">
                 <span>算法描述:</span>
-                <b
-                    >塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆</b
-                >
+                <b>{{ info.algorithmDescribe }}</b>
             </div>
             <div class="evaBox">
                 <span>算法简评:</span>
-                <b
-                    >塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆塞德里克福建省李逵负荆</b
-                >
+                <b>{{ info.algorithmEvaluation }}</b>
             </div>
         </div>
 
@@ -37,7 +33,29 @@
 
         <div class="tableBox tableBoxB">
             <div class="title">评价等级</div>
-            <tableList :columns="columnsA" :getDataWay="getDataWayA">
+            <tableList
+                :columns="columnsA"
+                :getDataWay="getDataWayA"
+                class="colorfulTable"
+            >
+                <!-- <el-table-column
+                    label="90<总分<100"
+                    slot="levelA"
+                    align="center"
+                >
+                    <template v-slot="scope">
+                        <div
+                            class=""
+                            style="background: red"
+                            v-if="scope.row.index === 1"
+                        >
+                            {{ scope.row.levelA }}
+                        </div>
+                        <div v-else style="background: blue">
+                            {{ scope.row.levelA }}
+                        </div>
+                    </template>
+                </el-table-column> -->
             </tableList>
         </div>
     </div>
@@ -51,26 +69,27 @@ export default {
     components: { tableList },
     data() {
         return {
+            id: "",
             columns: [
                 {
                     label: "测试项目",
-                    prop: "id",
+                    prop: "projectName",
+                },
+                {
+                    label: "场景数量",
+                    prop: "sceneNum",
                 },
                 {
                     label: "测试权重",
-                    prop: "ktName",
+                    prop: "weight",
                 },
                 {
                     label: "测试得分",
-                    prop: "jbSource",
+                    prop: "score",
                 },
                 {
                     label: "得分率",
-                    prop: "jbSource",
-                },
-                {
-                    label: "备注",
-                    prop: "startDateStr",
+                    prop: "scoreRatio",
                 },
             ],
             pagination: {
@@ -86,41 +105,30 @@ export default {
                 dataType: "data",
                 type: "post",
                 firstRequest: false,
-                data: [
-                    {
-                        id: 1,
-                        ktName: "kjdhfkjsdhfkjsjhdfksdjhfkhwoieyrhfisdhfksjhdf",
-                        jbSource: "收到就好付款时间的回复可见收到货覅无痕",
-                        asd: true,
-                    },
-                    { id: 2, asd: true },
-                    { id: 3, asd: true },
-                    { id: 4, asd: true },
-                    { id: 5, asd: true },
-                    { id: 6, asd: true },
-                ],
+                data: [],
                 param: {},
             },
             columnsA: [
                 {
                     label: "测试项目",
-                    prop: "id",
+                    prop: "name",
                 },
                 {
                     label: "90<总分<100",
-                    prop: "ktName",
+                    prop: "levelA",
+                    // template: true,
                 },
                 {
                     label: "80<总分<90",
-                    prop: "ktNam1e",
+                    prop: "levelB",
                 },
                 {
                     label: "70<总分<80",
-                    prop: "ktName2",
+                    prop: "levelC",
                 },
                 {
                     label: "0<总分<70",
-                    prop: "ktName3",
+                    prop: "levelD",
                 },
             ],
             getDataWayA: {
@@ -130,19 +138,25 @@ export default {
                 firstRequest: false,
                 data: [
                     {
-                        id: "",
-                        ktName: "优秀(G)",
-                        ktName1: "良好(A)",
-                        ktName2: "一般(M)",
-                        ktName3: "较差(P)",
+                        index: 1,
+                        name: "评价等级",
+                        levelA: "优秀(G)",
+                        levelB: "良好(A)",
+                        levelC: "一般(M)",
+                        levelD: "较差(P)",
                     },
                     {
-                        id: "",
-                        ktName: "优秀(G)",
+                        index: 2,
+                        name: "评价等级",
+                        levelA: "++++++",
+                        levelB: "+++++",
+                        levelC: "++++",
+                        levelD: "+++",
                     },
                 ],
                 param: {},
             },
+            info: {},
         };
     },
 
@@ -150,7 +164,28 @@ export default {
 
     methods: {},
 
-    // mounted() {},
+    mounted() {
+        if (this.$route.query.id) {
+            this.id = this.$route.query.id;
+
+            if (this.id) {
+                this.$axios({
+                    method: "post",
+                    url: this.$api.workManagement.selectProjectReportById,
+                    data: {
+                        id: this.id,
+                    },
+                }).then((res) => {
+                    if (res.code == 200 && res.info) {
+                        this.info = res.info;
+                        this.getDataWay.data = res.info.algorithmScoreList;
+                    } else {
+                        this.$message.error(res.message || "获取信息失败");
+                    }
+                });
+            }
+        }
+    },
 };
 </script>
 
@@ -233,5 +268,36 @@ export default {
     .tableBoxA {
         padding: 60px 0 30px;
     }
+
+    .colorfulTable {
+        /deep/ .el-table_2_column_7 {
+            background-color: #c1db69;
+        }
+        /deep/ .el-table_2_column_7:hover {
+            background-color: #c1db69;
+        }
+        /deep/ .el-table_2_column_8 {
+            background-color: #faf54a;
+        }
+        /deep/ .el-table_2_column_9 {
+            background-color: #ff9d33;
+        }
+        /deep/ .el-table_2_column_10 {
+            background-color: #f56c6c;
+        }
+
+        /deep/ .el-table__cell:hover,
+        /deep/ .el-table__row:hover {
+            background-color: transparent !important;
+        }
+    }
+
+    /deep/
+        .el-table--enable-row-hover
+        .el-table__body
+        tr:hover
+        > td.el-table__cell {
+        background-color: transparent !important;
+    }
 }
 </style>

src/views/workManagement/manualRunProjectDetail.vue

@@ -39,7 +39,10 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="选择车辆:" prop="vehicle">
-                    <el-select v-model="form.vehicle">
+                    <el-select
+                        v-model="form.vehicle"
+                        @change="vehicleSelChange"
+                    >
                         <el-option
                             v-for="item in vehicleList"
                             :label="item.name"
@@ -84,7 +87,17 @@
 
             <div class="tipBox">
                 <div class="tip tipA">
-                    (传感器1：根据车辆自动带出;传感器2：根据车辆自动带出)
+                    <!-- (传感器1：根据车辆自动带出;传感器2：根据车辆自动带出) -->
+                    <span
+                        v-for="item in sensors"
+                        :key="item"
+                        v-bind:class="{
+                            iconA: item === 'camera',
+                            iconB: item === 'ogt',
+                            iconC: item === 'lidar',
+                            iconE: item === 'gps',
+                        }"
+                    ></span>
                 </div>
                 <div class="tip">(场景数量：{{ sceneCount }})</div>
                 <!-- <div class="tip flexBox">
@@ -144,9 +157,9 @@ export default {
                 isChoiceGpu: "0", // 是否选择GPU
                 nowRunState: "10", // 运行状态
             },
-            algorithmList: [],
-            vehicleList: [],
-            sceneList: [],
+            algorithmList: [], // 算法对应列表
+            vehicleList: [], // 车辆对应列表
+            sceneList: [], // 场景对应列表
             maxCount: 0, // 最多可用资源
             sceneCount: 0, // 场景数量
             rules: {
@@ -185,14 +198,15 @@ export default {
                     { required: true, message: "请选择", trigger: "change" },
                 ],
             },
+            sensors: [], // 选中车辆后对应的传感器数组
         };
     },
 
     computed: {},
 
     methods: {
-        getLists() {
-            this.$axios({
+        async getLists() {
+            await this.$axios({
                 method: "post",
                 url: this.$api.workManagement.selectDropDownByType,
                 data: {
@@ -214,8 +228,8 @@ export default {
                 }
             });
         },
-        getMaxSimulationTime() {
-            this.$axios({
+        async getMaxSimulationTime() {
+            await this.$axios({
                 method: "post",
                 url: this.$api.workManagement.selectMaxParallelism,
                 data: {},
@@ -234,6 +248,16 @@ export default {
                 (i) => i.id === item
             ).sceneNum;
         },
+        vehicleSelChange(item) {
+            let sensor = this.vehicleList.find((i) => i.id === item).sensor;
+
+            if (!sensor) {
+                this.sensors = [];
+            } else {
+                this.sensors = sensor.split(",");
+            }
+            console.log(this.sensors);
+        },
         save(isAdd = false, needChange = false) {
             // isAdd是否强制新增，needChange是否需要改变状态
             this.$refs.form.validate((valid) => {
@@ -289,12 +313,12 @@ export default {
     },
 
     mounted() {
-        /* this.getLists();
-        this.getMaxSimulationTime(); */
+        this.getLists();
+        this.getMaxSimulationTime();
 
-        if (this.$route.query.formData) {
+        if (this.$route.query.id) {
             let id = "";
-            this.form.id = id = this.$route.query.formData.id;
+            this.form.id = id = this.$route.query.id;
 
             if (id) {
                 this.$axios({
@@ -339,6 +363,7 @@ export default {
     }
 
     .tipBox {
+        min-width: 270px;
         margin-left: 20px;
 
         .tip {
@@ -347,7 +372,42 @@ export default {
         }
 
         .tipA {
+            height: 32px;
             margin-top: 226px;
+
+            .iconA {
+                background: url("../../assets/common/image/sensor/001.png")
+                    center no-repeat;
+                    background-size: contain;
+            }
+            .iconB {
+                background: url("../../assets/common/image/sensor/002.png")
+                    center no-repeat;
+                    background-size: contain;
+            }
+            .iconC {
+                background: url("../../assets/common/image/sensor/003.png")
+                    center no-repeat;
+                    background-size: contain;
+            }
+            .iconD {
+                background: url("../../assets/common/image/sensor/004.png")
+                    center no-repeat;
+                    background-size: contain;
+            }
+            .iconE {
+                background: url("../../assets/common/image/sensor/005.png")
+                    center no-repeat;
+                    background-size: contain;
+            }
+
+            span {
+                display: inline-block;
+                width: 18px;
+                height: 18px;
+                margin-top: 7px;
+                margin-right: 6px;
+            }
         }
 
         .tipB {

src/views/workManagement/manualRunProjectList.vue

@@ -98,7 +98,7 @@
 
         <tableList
             ref="table"
-            style="margin: 0 30px;"
+            style="margin: 0 30px"
             :columns="columns"
             :getDataWay="getDataWay"
             :pagination="pagination"
@@ -119,6 +119,7 @@
             <el-table-column label="操作" slot="cgInfos" align="center">
                 <template v-slot="scope">
                     <i
+                        v-if="scope.row.nowRunState === '20'"
                         @click="addMarkDia(scope.row)"
                         class="el-icon-video-pause elIcon"
                         title="停用"
@@ -130,11 +131,13 @@
                         title="删除"
                     ></i>
                     <i
+                        v-if="scope.row.nowRunState === '30'"
                         @click="viewRow(scope.row)"
                         class="el-icon-view elIcon"
                         title="查看"
                     ></i>
                     <i
+                        v-if="scope.row.nowRunState === '10'"
                         @click="addMarkDia(scope.row)"
                         class="el-icon-video-play elIcon"
                         title="运行"
@@ -145,11 +148,12 @@
                         class="el-icon-edit-outline elIcon"
                         title="编辑"
                     ></i>
-                    <i
+                    <!-- <i
+                        v-if="scope.row.nowRunState != '10'"
                         @click="downRow(scope.row)"
                         class="el-icon-download elIcon"
                         title="下载"
-                    ></i>
+                    ></i> -->
                 </template>
             </el-table-column>
         </tableList>
@@ -316,9 +320,7 @@ export default {
             this.$router.push({
                 path: "/manualRunProjectDetail",
                 query: {
-                    formData: {
-                        id: row.id,
-                    },
+                    id: row.id,
                 },
             });
         },
@@ -366,7 +368,7 @@ export default {
         },
 
         viewRow() {
-            this.$router.push({ path: "/projectInfo" });
+            this.$router.push({ path: "/projectInfo", query: { id: row.id } });
         },
         addMarkDia() {},
         downRow(row) {

src/views/workManagement/projectInfo.vue

@@ -8,33 +8,31 @@
                 <div class="boxContent">
                     <div class="info">
                         <span>项目ID:</span>
-                        <b>6546857987654324687</b>
+                        <b>{{ info.projectId }}</b>
                     </div>
                     <div class="info">
                         <span>项目名称:</span>
-                        <b>仿真云平台系统</b>
+                        <b>{{ info.projectName }}</b>
                     </div>
                     <div class="info">
                         <span>项目描述:</span>
-                        <b
-                            >仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统</b
-                        >
+                        <b>{{ info.projectDescribe }}</b>
                     </div>
                     <div class="info">
                         <span>创建时间:</span>
-                        <b>2022-01-01</b>
+                        <b>{{ info.startTime }}</b>
                     </div>
                     <div class="info">
                         <span>完成时间:</span>
-                        <b>2022-08-01</b>
+                        <b>{{ info.finishTime }}</b>
                     </div>
                     <div class="info">
                         <span>完成进度:</span>
-                        <b>81%</b>
+                        <b>{{ info.nowRunState }}</b>
                     </div>
                     <div class="info">
                         <span>结果等级:</span>
-                        <b>优秀</b>
+                        <b>{{ info.evaluationLevel }}</b>
                     </div>
                 </div>
             </div>
@@ -45,13 +43,11 @@
                 <div class="boxContent">
                     <div class="info">
                         <span>算法名称:</span>
-                        <b>6546857987654324687</b>
+                        <b>{{ info.algorithmName }}</b>
                     </div>
                     <div class="info">
                         <span>算法描述:</span>
-                        <b
-                            >仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统</b
-                        >
+                        <b>{{ info.algorithmDescribe }}</b>
                     </div>
                 </div>
             </div>
@@ -63,8 +59,8 @@
                 <div class="boxContent boxContentC">
                     <div class="cbox" @click="toReport">
                         <img
-                            src="../../assets/common/image/car.png"
-                            width="300px"
+                            src="../../assets/common/image/others/1.png"
+                            width="100%"
                         />
                         <div>仿真云测试报告</div>
                     </div>
@@ -80,29 +76,26 @@
                 <div class="boxContentA">
                     <div class="info">
                         <span>车辆名称:</span>
-                        <b>6546857987654324687</b>
+                        <b>{{ info.vehicleName }}</b>
                     </div>
                     <div class="info">
                         <span>车辆描述:</span>
-                        <b
-                            >仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统仿真云平台系统</b
-                        >
+                        <b>{{ info.vehicleDescribe }}</b>
                     </div>
                 </div>
                 <div class="boxContentB">
                     <div class="list">
                         <handle-config-list
-                            v-for="index in 4"
-                            :isActiveA="index === 1"
-                            :titleCode="index - 1"
-                            :key="index"
                             :showBtns="false"
+                            :curOne="curOne"
+                            :configList="configList"
+                            @curItem="curItem"
                         ></handle-config-list>
                     </div>
                     <div>
                         <img
-                            src="../../assets/common/image/car.png"
-                            width="300px"
+                            src="../../assets/common/image/others/2.png"
+                            width="100%"
                         />
                     </div>
                 </div>
@@ -115,17 +108,11 @@
             </div>
             <div class="box">
                 <div class="boxContentA">
-                    <div>
-                        <img
-                            src="../../assets/common/image/car.png"
-                            width="300px"
-                        />
+                    <div class="pie">
+                        <pie-chart key="1"></pie-chart>
                     </div>
-                    <div>
-                        <img
-                            src="../../assets/common/image/car.png"
-                            width="300px"
-                        />
+                    <div class="pie">
+                        <pie-chart key="2"></pie-chart>
                     </div>
                 </div>
                 <div>
@@ -159,12 +146,15 @@
 <script>
 import handleConfigList from "../modelLibrary/components/handleConfigList.vue";
 import tableList from "@/components/grid/TableList";
+import pieChart from "@/components/echarts/pieChart";
 
 export default {
     name: "projectInfo", // 项目详情
-    components: { handleConfigList, tableList },
+    components: { handleConfigList, tableList, pieChart },
     data() {
         return {
+            id: "",
+            info: {},
             columns: [
                 {
                     label: "ID",
@@ -172,23 +162,23 @@ export default {
                 },
                 {
                     label: "场景名称",
-                    prop: "ktName",
+                    prop: "sceneName",
                 },
                 {
                     label: "运行开始时间",
-                    prop: "jbSource",
+                    prop: "runStartTimeFmt",
                 },
                 {
                     label: "运行结束时间",
-                    prop: "jbSource",
+                    prop: "runEndTimeFmt",
                 },
                 {
                     label: "运行状态",
-                    prop: "startDateStr",
+                    prop: "runState",
                 },
                 {
                     label: "运行结果",
-                    prop: "jbSource",
+                    prop: "runResult",
                 },
                 {
                     label: "操作",
@@ -206,23 +196,25 @@ export default {
             },
             getDataWay: {
                 //加载表格数据
-                dataType: "data",
+                dataType: "url",
                 type: "post",
-                firstRequest: false,
-                data: [
-                    {
-                        id: 1,
-                        ktName: "kjdhfkjsdhfkjsjhdfksdjhfkhwoieyrhfisdhfksjhdf",
-                        jbSource: "收到就好付款时间的回复可见收到货覅无痕",
-                        asd: true,
-                    },
-                    { id: 2, asd: true },
-                    { id: 3, asd: true },
-                    { id: 4, asd: true },
-                    { id: 5, asd: true },
-                    { id: 6, asd: true },
-                ],
-                param: {},
+                // firstRequest: false,
+                data: this.$api.workManagement.selectProjectTaskList,
+                param: {
+                    id: this.$route.query.id,
+                },
+            },
+            // 传感器对象集合
+            configList: {
+                camera: [],
+                ogt: [],
+                lidar: [],
+                gps: [],
+            },
+            // 用于当前选中项的展示
+            curOne: {
+                name: "",
+                index: -1,
             },
         };
     },
@@ -234,11 +226,42 @@ export default {
             this.$router.push({ path: "/taskInfo" });
         },
         toReport() {
-            this.$router.push({ path: "/evaluationReport" });
+            this.$router.push({
+                path: "/evaluationReport",
+                query: { id: this.id },
+            });
+        },
+        curItem(item) {
+            this.curOne = item;
         },
     },
 
-    // mounted() {},
+    mounted() {
+        if (this.$route.query.id) {
+            this.id = this.$route.query.id;
+
+            if (this.id) {
+                this.$axios({
+                    method: "post",
+                    url: this.$api.workManagement.selectProjectDetailsById,
+                    data: {
+                        id: this.id,
+                    },
+                }).then((res) => {
+                    if (res.code == 200 && res.info) {
+                        this.info = res.info;
+                        this.configList.camera =
+                            res.info.sensorCameraList || [];
+                        this.configList.ogt = res.info.sensorOgtList || [];
+                        this.configList.lidar = res.info.sensorLidarList || [];
+                        this.configList.gps = res.info.sensorGpsList || [];
+                    } else {
+                        this.$message.error(res.message || "获取信息失败");
+                    }
+                });
+            }
+        }
+    },
 };
 </script>
 
@@ -358,6 +381,10 @@ export default {
             justify-content: space-around;
             padding: 45px 0;
         }
+
+        .pie {
+            width: 50%;
+        }
     }
 }
 </style>

vue.config.js

@@ -89,8 +89,8 @@ module.exports = {
                 }
             },
             '/simulation/resource/server': {
-                target: 'http://10.15.12.73:7003',  // 王志强
-                // target: 'http://10.15.12.88:7003',  // 王耀栋
+                // target: 'http://10.15.12.73:7003',  // 王志强
+                target: 'http://10.15.12.88:7003',  // 王耀栋
                 // target: 'http://10.15.12.72:7003',  // 王晓峰
                 // target: 'http://10.15.12.87:7003',  // 赵艳
                 changeOrigin: true,