Merge branch 'main' of http://carsafe.uicp.cn/Front_Team/SPDM

src/views/task/simulationTask/allTask/index.vue

@@ -85,7 +85,7 @@ defineProps({
   // 使用的动态表格名称
   currentTableName: {
     type: String,
-    default: 'SIMULATION_TASK_ALL_LIST',
+    default: 'SIMULATION_TASK_EXECUTE_LIST',
   },
   // 是否展示操作栏
   canOperate: {

src/views/task/simulationTask/attentionTask/index.vue

@@ -4,7 +4,7 @@
     <taskTable
       showIndex
       ref="tableRef"
-      tableName="SIMULATION_TASK_ATTENTION_LIST"
+      tableName="SIMULATION_TASK_EXECUTE_LIST"
       :params="taskParams"
       exportFileName="我关注的任务列表"
       :actionList="actionList"

src/views/task/simulationTask/confirmTask/index.vue

@@ -115,9 +115,6 @@
             />
           </el-select>
         </el-form-item>
-        <!-- {{ insertTaskMode }}
-        {{ insertTaskMode === 'lib' }}
-        {{ insertTaskMode }} -->
         <el-form-item label="选择工况：" prop="chooseTaskList" v-if="insertTaskMode === 'lib'">
           <el-select-v2
             v-model="sendForm.chooseTaskList"
@@ -148,21 +145,10 @@
             value-format="YYYY-MM-DD HH:mm:ss"
           />
         </el-form-item>
-        <!-- <el-form-item label="计划结束时间">
-          <el-date-picker
-            v-model="sendForm.endTime"
-            type="datetime"
-            placeholder="选择日期"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-          />
-        </el-form-item> -->
         <el-form-item label="仿真执行人：" prop="eMemberList">
           <UserSelect v-model="sendForm.eMemberList" :multiple="true" />
         </el-form-item>
       </el-form>
-      <!-- <TableForm ref="tableFormRef" tableName="SIMULATION_TASK_DEMAND_CONFIRM" >
-      </TableForm> -->
       <template #footer>
         <div>
           <el-button @click="closeSendFun">取消</el-button>

src/views/task/simulationTask/newDemand/index.vue

@@ -352,6 +352,8 @@ const createDemandApiFun = async (fromData: any) => {
     ...fromData,
 
     demandStatus: '0',
+    // 是否走利元亨创建需求直接创建任务逻辑
+    isLyric: enableConfigByTenant([TENANT_ENUM.LYRIC]),
   };
   const res: any = await addDemandApi(params);
   if (res.code === 200) {