feat: 多模式仿真新增和编辑添加多仿真组选择

src/components/grid/searchLayout.vue

@@ -25,6 +25,12 @@
             <div class="inputBox">
                 <slot name="searchItem8"></slot>
             </div>
+			<div class="inputBox">
+			    <slot name="searchItem9"></slot>
+			</div>
+			<div class="inputBox">
+			    <slot name="searchItem10"></slot>
+			</div>
             <div class="inputBox searchItem27">
                 <slot name="searchItem27"></slot>
             </div>

src/views/workManagement/simulationEdit.vue

@@ -36,6 +36,15 @@
           :disabled="!isEdit">
         </el-input>
       </template>
+	  
+	  <template slot="searchItem10">
+	    <span class="label">仿真镜像组</span>
+		
+		<el-select v-model="baseInfo.simulationMageGroupId">
+			<el-option v-for="item in simulationMageGroup" :label="item.groupName" :value="item.id"
+				:key="item.id"></el-option>
+		</el-select>
+	  </template>
     </search-layout>
     <p style="
         font-size: 18px;
@@ -81,6 +90,7 @@ export default {
 
   data () {
     return {
+	  simulationMageGroup: [],
       isEdit: true, // 模式， 默认编辑模式 false 预览
       isUpdate: false, //  更新模式
       tableShow: false, // 是否显示表格，新增默认不显示
@@ -90,6 +100,7 @@ export default {
         projectName: '', // 项目名称
         projectMaxSeconds: '', // 最大仿真时间
         projectDescription: '', // 项目描述
+		simulationMageGroupId: '',//仿真镜像组id
       },
       selectSceneIds: [], // 选中ids
       columns: [
@@ -142,8 +153,22 @@ export default {
       this.$store.commit("getEvaluateTabname", '多仿真任务详情');
       localStorage.setItem("evaluateTabname", '多仿真任务详情');
     }
+	this.getSimulationMageGroup();
   },
   methods: {
+	  getSimulationMageGroup() {
+	  	this.$axios({
+	  		method: 'post',
+	  		url: this.$api.workManagement.selectAllSimulationMageGroupList,
+	  		data: {},
+	  	}).then((res) => {
+	  		if (res.code == 200) {
+	  			this.simulationMageGroup = res.info
+	  		} else {
+	  			this.$message.error(res.message || '获取信息失败')
+	  		}
+	  	})
+	  },
     // 获取任务详情信息
     getTaskDetailById (id) {
       this.$axios({
@@ -158,6 +183,7 @@ export default {
             projectName: res.info.projectName, // 项目名称
             projectMaxSeconds: res.info.projectMaxSeconds, // 最大仿真时间
             projectDescription: res.info.projectDescription, // 项目描述
+			simulationMageGroupId: res.info.simulationMageGroupId,//仿真镜像组id
           }
           this.$store.commit("getEvaluateTabname", res.info.projectName);
           localStorage.setItem("evaluateTabname", res.info.projectName);
@@ -192,6 +218,7 @@ export default {
           projectName: this.baseInfo.projectName,
           projectMaxSeconds: this.baseInfo.projectMaxSeconds,
           projectDescription: this.baseInfo.projectDescription,
+		  simulationMageGroupId: this.baseInfo.simulationMageGroupId
         },
       }).then((res) => {
         if (res.code == 200) {
@@ -285,6 +312,7 @@ export default {
             projectName: this.baseInfo.projectName,
             projectMaxSeconds: this.baseInfo.projectMaxSeconds,
             projectDescription: this.baseInfo.projectDescription,
+			simulationMageGroupId: this.baseInfo.simulationMageGroupId
           },
         }).then((res) => {
           if (res.code == 200) {
@@ -307,6 +335,7 @@ export default {
               projectName: this.baseInfo.projectName,
               projectMaxSeconds: this.baseInfo.projectMaxSeconds,
               projectDescription: this.baseInfo.projectDescription,
+			  simulationMageGroupId: this.baseInfo.simulationMageGroupId
             },
           }).then((res) => {
             if (res.code == 200) {

src/views/workManagement/simulationHome.vue

@@ -1,287 +1,254 @@
 <template>
-    <router-view v-if="$route.path.includes('simulationMap')"></router-view>
-    <router-view v-else-if="$route.path.includes('simulationEdit')"></router-view>
-    <router-view v-else-if="$route.path.includes('simulationEvaluate')"></router-view>
+	<router-view v-if="$route.path.includes('simulationMap')"></router-view>
+	<router-view v-else-if="$route.path.includes('simulationEdit')"></router-view>
+	<router-view v-else-if="$route.path.includes('simulationEvaluate')"></router-view>
 
-    
-  <div v-else class="multimodeSimulation">
-    <search-layout :needBox="true">
-      <template slot="searchItem1">
-        <span class="label">项目ID</span>
-        <el-input
-          v-model="searchParams.projectId"
-          size="small"
-          clearable
-          placeholder="请输入"
-          maxlength="60"
-        >
-        </el-input>
-      </template>
-      <template slot="searchItem1">
-        <span class="label">项目名称</span>
-        <el-input
-          v-model="searchParams.projectName"
-          size="small"
-          clearable
-          placeholder="请输入"
-          maxlength="60"
-        >
-        </el-input>
-      </template>
-      <template slot="searchItem4">
-        <span class="label">项目进度</span>
-        <el-select
-          v-model="searchParams.projectStatus"
-          size="small"
-          clearable
-          placeholder="请输入"
-          maxlength="60"
-        >
-          <el-option
-            v-for="(item, idx) in [
+
+	<div v-else class="multimodeSimulation">
+		<search-layout :needBox="true">
+			<template slot="searchItem1">
+				<span class="label">项目ID</span>
+				<el-input v-model="searchParams.projectId" size="small" clearable placeholder="请输入" maxlength="60">
+				</el-input>
+			</template>
+			<template slot="searchItem1">
+				<span class="label">项目名称</span>
+				<el-input v-model="searchParams.projectName" size="small" clearable placeholder="请输入" maxlength="60">
+				</el-input>
+			</template>
+			<template slot="searchItem4">
+				<span class="label">项目进度</span>
+				<el-select v-model="searchParams.projectStatus" size="small" clearable placeholder="请输入" maxlength="60">
+					<el-option v-for="(item, idx) in [
               { label: '未开始', value: '0' },
               { label: '运行中', value: '1' },
               { label: '已终止', value: '2' },
               { label: '已完成', value: '3' },
-            ]"
-            :label="item.label"
-            :value="item.value"
-            :key="idx"
-          ></el-option>
-        </el-select>
-      </template>
-      <template slot="searchBtn1">
-        <el-button type="primary" @click="doSearch">查询</el-button>
-        <el-button type="primary" @click="doReset">重置</el-button>
-      </template>
-    </search-layout>
-    <div></div>
-    <div style="display: flex; justify-content: end; margin: 20px 50px">
-      <el-button
-        class="addBtn"
-        icon="el-icon-circle-plus-outline"
-        @click="mapConfig"
-        type="primary"
-        >地图管理</el-button>
-      <el-button
-        class="addBtn"
-        icon="el-icon-circle-plus-outline"
-        @click="addConfig"
-        type="primary"
-        >新增</el-button
-      >
-    </div>
-    <tableList
-      ref="table"
-      style="margin: 0 30px 30px"
-      :columns="simulationColumns"
-      :getDataWay="getDataWay"
-      :pagination="pagination"
-      index
-    >
-      <el-table-column label="操作" slot="cgInfos" align="center" width="180">
-        <template v-slot="scope">
-          <!-- <span v-if="scope.row.projectStatus==1" @click="" class="elIcon"> 查看 </span> -->
-          <i
-            v-if="scope.row.projectStatus == '3'"
-            @click="jumpEvaluate('preview',scope.row.id,scope)"
-            class="el-icon-view elIcon"
-            title="查看"
-          >
-          </i>
-          <i
-            v-if="scope.row.projectStatus == '0'"
-            @click="jumpDetailPage('edit',scope.row.id)"
-            class="el-icon-edit-outline elIcon"
-            title="编辑"
-          >
-          </i>
-          <i @click="downloadTask(scope.row)" v-if="scope.row.projectStatus == '3'" class="el-icon-download elIcon" title="下载">
-          </i>
-          <i @click="deleteById(scope.row)" class="elIcon el-icon-delete" title="删除">  </i>
-          <i
-            v-if="scope.row.projectStatus == '2'"
-            @click="updateTask(scope.row)"
-            class="elIcon myIconPause"
-            title="终止"
-          >
-            
-          </i>
+            ]" :label="item.label" :value="item.value" :key="idx"></el-option>
+				</el-select>
+			</template>
+			<template slot="searchBtn1">
+				<el-button type="primary" @click="doSearch">查询</el-button>
+				<el-button type="primary" @click="doReset">重置</el-button>
+			</template>
+		</search-layout>
+		<div></div>
+		<div style="display: flex; justify-content: end; margin: 20px 50px">
+			<el-button class="addBtn" icon="el-icon-circle-plus-outline" @click="mapConfig"
+				type="primary">地图管理</el-button>
+			<el-button class="addBtn" icon="el-icon-circle-plus-outline" @click="addConfig"
+				type="primary">新增</el-button>
+		</div>
+		<tableList ref="table" style="margin: 0 30px 30px" :columns="simulationColumns" :getDataWay="getDataWay"
+			:pagination="pagination" index>
+			<el-table-column label="操作" slot="cgInfos" align="center" width="180">
+				<template v-slot="scope">
+					<!-- <span v-if="scope.row.projectStatus==1" @click="" class="elIcon"> 查看 </span> -->
+					<i v-if="scope.row.projectStatus == '3'" @click="jumpEvaluate('preview',scope.row.id,scope)"
+						class="el-icon-view elIcon" title="查看">
+					</i>
+					<i v-if="scope.row.projectStatus == '0'" @click="jumpDetailPage('edit',scope.row.id)"
+						class="el-icon-edit-outline elIcon" title="编辑">
+					</i>
+					<i @click="downloadTask(scope.row)" v-if="scope.row.projectStatus == '3'"
+						class="el-icon-download elIcon" title="下载">
+					</i>
+					<i @click="deleteById(scope.row)" class="elIcon el-icon-delete" title="删除"> </i>
+					<i v-if="scope.row.projectStatus == '2'" @click="updateTask(scope.row)" class="elIcon myIconPause"
+						title="终止">
+
+					</i>
 
-          <i
-            v-if="scope.row.projectStatus == '0'"
-            @click="updateTask(scope.row)"
-            class="elIcon el-icon-refresh-right"
-            title="运行"
-          >
-          </i>
-        </template>
-      </el-table-column>
-    </tableList>
-  </div>
+					<i v-if="scope.row.projectStatus == '0'" @click="updateTask(scope.row)"
+						class="elIcon el-icon-refresh-right" title="运行">
+					</i>
+				</template>
+			</el-table-column>
+		</tableList>
+	</div>
 </template>
 <script>
-import searchLayout from '@/components/grid/searchLayout'
-import tableList from '@/components/grid/TableList'
-import { mapState } from 'vuex'
-export default {
-  name: 'multimodeSimulation', // 多模式仿真
-  components: { searchLayout, tableList },
-  data() {
-    return {
-      searchParams: {
-        projectId: '', // 项目id
-        projectName: '', // 项目名称
-        projectStatus: '', // 项目进度
-      },
-      // 多模式仿真表头
-      simulationColumns: [
-        {
-          label: '项目ID',
-          prop: 'id',
-        },
-        {
-          label: '项目名称',
-          prop: 'projectName',
-        },
-        {
-          label: '场景数量',
-          prop: 'sceneNums',
-        },
-        {
-          label: '创建时间',
-          prop: 'createTime',
-        },
-        {
-          label: '进度',
-          prop: 'projectStatusValue',
-        },
-        {
-          label: '操作',
-          prop: 'cgInfos',
-          template: true,
-        },
-      ],
-      pagination: {
-        //分页使用
-        currentPage: 1,
-        pageSize: 10,
-        position: 'right',
-        pageSizes: [10, 30, 50, 100, 200],
-        layout: 'sizes, total, prev, pager, next, jumper',
-      },
-      getDataWay: {
-        //加载表格数据
-        dataType: 'url',
-        type: 'post',
-        data: this.$api.multimode.queryMulationList,
-        param: {},
-      },
-    }
-  },
-  methods: {
-    refreshList(param) {
-      param
-        ? this.$refs['table'].loadData(param)
-        : this.$refs['table'].loadData()
-    },
-    doSearch() {
-      this.refreshList({ ...this.searchParams })
-    },
-    doReset() {
-      this.searchParams = {
-        projectId: '', // 项目id
-        projectName: '', // 项目名称
-        projectStatus: '', // 项目进度
-      }
-      this.doSearch()
-      // this.refreshList()
-    },
-    // 仿真任务状态更新
-    updateTask(row) {
-      const { id, projectStatus } = row
-      this.$axios({
-        method: 'post',
-        url: this.$api.multimode.updateMulationStatus,
-        data: {
-          projectId: id,
-          projectStatus: projectStatus == 0 || 2 ? 1 : 2,
-        },
-      }).then((res) => {
-        if (res.code == 200) {
-          this.$message.success('状态更新成功')
-          this.doSearch()
-        } else {
-          this.$message.error(res.message || '更新失败')
-        }
-      })
-    },
-    // 删除仿真列表
-    deleteById(row) {
-      this.$axios({
-        method: 'post',
-        url: this.$api.multimode.deleteMulationById,
-        data: { projectId: row.id },
-      }).then((res) => {
-        if (res.code == 200) {
-          this.$message.success('删除成功')
-          this.doSearch()
-        } else {
-          this.$message.error(res.message || '删除失败')
-        }
-      })
-    },
-    // 下载仿真任务
-    downloadTask(row){
-      this.$axios({
-        method: 'get',
-        url: `${this.$api.multimode.downloadMulation}?projectId=${row.id}`,
-        responseType: "blob", 
-      }).then((res) => {
-       this.$blobZipDown(res,row.projectName)
-      })
-    },
-    addConfig() {
-      this.$router.push({
-        path: '/multimodeSimulation/simulationEdit',
-        query: { mode: 'add' },
-      })
-    },
-    // 跳转地图管理
-    mapConfig(){
-      this.$router.push({
-        path: "/multimodeSimulation/simulationMap",
-      })
-    },
-    // 跳转评价页面
-    jumpEvaluate(mode,id,opt){
-      this.$store.commit("getEvaluateTabname", opt.row.projectName);
-      localStorage.setItem("evaluateTabname", opt.row.projectName);
-      this.$router.push({
-        path: '/multimodeSimulation/simulationEvaluate',
-        query: { mode,id },
-      })
-    },
-    jumpDetailPage(mode,id) {
-      this.$router.push({
-        path: '/multimodeSimulation/simulationEdit',
-        query: { mode,id },
-      })
-    },
-  },
-}
+	import searchLayout from '@/components/grid/searchLayout'
+	import tableList from '@/components/grid/TableList'
+	import {
+		mapState
+	} from 'vuex'
+	export default {
+		name: 'multimodeSimulation', // 多模式仿真
+		components: {
+			searchLayout,
+			tableList
+		},
+		data() {
+			return {
+				searchParams: {
+					projectId: '', // 项目id
+					projectName: '', // 项目名称
+					projectStatus: '', // 项目进度
+				},
+				// 多模式仿真表头
+				simulationColumns: [{
+						label: '项目ID',
+						prop: 'id',
+					},
+					{
+						label: '项目名称',
+						prop: 'projectName',
+					},
+					{
+						label: '场景数量',
+						prop: 'sceneNums',
+					},
+					{
+						label: '创建时间',
+						prop: 'createTime',
+					},
+					{
+						label: '进度',
+						prop: 'projectStatusValue',
+					},
+					{
+						label: '操作',
+						prop: 'cgInfos',
+						template: true,
+					},
+				],
+				pagination: {
+					//分页使用
+					currentPage: 1,
+					pageSize: 10,
+					position: 'right',
+					pageSizes: [10, 30, 50, 100, 200],
+					layout: 'sizes, total, prev, pager, next, jumper',
+				},
+				getDataWay: {
+					//加载表格数据
+					dataType: 'url',
+					type: 'post',
+					data: this.$api.multimode.queryMulationList,
+					param: {},
+				},
+			}
+		},
+		methods: {
+			refreshList(param) {
+				param
+					?
+					this.$refs['table'].loadData(param) :
+					this.$refs['table'].loadData()
+			},
+			doSearch() {
+				this.refreshList({
+					...this.searchParams
+				})
+			},
+			doReset() {
+				this.searchParams = {
+					projectId: '', // 项目id
+					projectName: '', // 项目名称
+					projectStatus: '', // 项目进度
+				}
+				this.doSearch()
+				// this.refreshList()
+			},
+			// 仿真任务状态更新
+			updateTask(row) {
+				const {
+					id,
+					projectStatus
+				} = row
+				this.$axios({
+					method: 'post',
+					url: this.$api.multimode.updateMulationStatus,
+					data: {
+						projectId: id,
+						projectStatus: projectStatus == 0 || 2 ? 1 : 2,
+					},
+				}).then((res) => {
+					if (res.code == 200) {
+						this.$message.success('状态更新成功')
+						this.doSearch()
+					} else {
+						this.$message.error(res.message || '更新失败')
+					}
+				})
+			},
+			// 删除仿真列表
+			deleteById(row) {
+				this.$axios({
+					method: 'post',
+					url: this.$api.multimode.deleteMulationById,
+					data: {
+						projectId: row.id
+					},
+				}).then((res) => {
+					if (res.code == 200) {
+						this.$message.success('删除成功')
+						this.doSearch()
+					} else {
+						this.$message.error(res.message || '删除失败')
+					}
+				})
+			},
+			// 下载仿真任务
+			downloadTask(row) {
+				this.$axios({
+					method: 'get',
+					url: `${this.$api.multimode.downloadMulation}?projectId=${row.id}`,
+					responseType: "blob",
+				}).then((res) => {
+					this.$blobZipDown(res, row.projectName)
+				})
+			},
+			addConfig() {
+				this.$router.push({
+					path: '/multimodeSimulation/simulationEdit',
+					query: {
+						mode: 'add'
+					},
+				})
+			},
+			// 跳转地图管理
+			mapConfig() {
+				this.$router.push({
+					path: "/multimodeSimulation/simulationMap",
+				})
+			},
+			// 跳转评价页面
+			jumpEvaluate(mode, id, opt) {
+				this.$store.commit("getEvaluateTabname", opt.row.projectName);
+				localStorage.setItem("evaluateTabname", opt.row.projectName);
+				this.$router.push({
+					path: '/multimodeSimulation/simulationEvaluate',
+					query: {
+						mode,
+						id
+					},
+				})
+			},
+			jumpDetailPage(mode, id) {
+				this.$router.push({
+					path: '/multimodeSimulation/simulationEdit',
+					query: {
+						mode,
+						id
+					},
+				})
+			}
+		},
+	}
 </script>
 <style lang='less' scoped>
-// @import './common/util.less';
-.naturalDrivingScenarioListPanel {
-  .inputBox {
-    .label {
-      min-width: 75px;
-    }
-  }
+	// @import './common/util.less';
+	.naturalDrivingScenarioListPanel {
+		.inputBox {
+			.label {
+				min-width: 75px;
+			}
+		}
 
-  .btnsPanel {
-    text-align: right;
-  }
-}
+		.btnsPanel {
+			text-align: right;
+		}
+	}
 </style>