1
0

2 Commity f592de371e ... b0fdb6e7ba

Autor SHA1 Správa Dátum
  zhaoen b0fdb6e7ba Merge remote-tracking branch 'origin/master' 4 mesiacov pred
  zhaoen e325c3b0ec 仿真推演 仿真推演任务设定 4 mesiacov pred

+ 24 - 0
src/api/deductionTask/index.js

@@ -0,0 +1,24 @@
+import request from "@/utils/request";
+
+export function getList(data) {
+    return request({
+        url: "/api/v1/sim-simulation/findPageDet",
+        method: "get",
+        params:data,
+    });
+}
+
+export function insertDeductionTask(data) {
+    return request({
+        url: "/api/v1/sim-simulation/insert",
+        method: "post",
+        data,
+    });
+}
+export function updateDeductionTask(data) {
+    return request({
+        url: "/api/v1/sim-simulation/update",
+        method: "post",
+        data,
+    });
+}

+ 8 - 0
src/api/planningScheme/index.js

@@ -8,6 +8,14 @@ export function planningSchemePage(params) {
     });
 }
 
+export function getListVer(data) {
+    return request({
+        url: "/api/v1/planning-scheme/getListVer",
+        method: "post",
+        data,
+    });
+}
+
 export function synergismSchemePage(params) {
     return request({
         url: "/api/v1/planning-scheme/user-roles-page",

+ 11 - 24
src/components/GlobalComponents/VirtualCard.vue

@@ -7,12 +7,12 @@
           {{ plan.secretLevel }}
         </div>
         <el-tooltip
-            :content="plan.planName + '-' + plan.simulationParticipantTasks"
+            :content="plan.simulationName"
             placement="top"
             :disabled="!isPlanNameOverflow"
         >
           <h3 ref="planNameRef" class="plan-name" style="color: #e0e6ed">
-            {{ plan.planName + "-" + plan.simulationParticipantTasks }}
+            {{ plan.simulationName }}
           </h3>
         </el-tooltip>
         <!-- 状态标签(保留注释以便后续恢复) -->
@@ -34,7 +34,7 @@
         <div class="info-row">
           <span class="info-label dark-label">推演任务名称:</span>
           <el-tooltip
-              :content="plan.simulationTaskName"
+              :content="plan.simulationName"
               placement="top"
               :disabled="!isSimulationTaskNameOverflow"
           >
@@ -42,7 +42,7 @@
                 ref="simulationTaskNameRef"
                 class="info-value dark-value text-ellipsis"
             >
-              {{ plan.simulationTaskName || "-" }}
+              {{ plan.simulationName || "-" }}
             </span>
           </el-tooltip>
         </div>
@@ -79,7 +79,7 @@
         <div class="info-row">
           <span class="info-label dark-label">推演次数:</span>
           <el-tooltip
-              :content="plan.simulationCount"
+              :content="plan.numberOfSimulations"
               placement="top"
               :disabled="!isSimulationCountOverflow"
           >
@@ -87,7 +87,7 @@
                 ref="simulationCountRef"
                 class="info-value dark-value text-ellipsis"
             >
-              {{ plan.simulationCount || "-" }}
+              {{ plan.numberOfSimulations || "-" }}
             </span>
           </el-tooltip>
         </div>
@@ -97,7 +97,7 @@
         <div class="info-row">
           <span class="info-label dark-label">推演参试任务:</span>
           <el-tooltip
-              :content="plan.simulationParticipantTasks"
+              :content="plan.taskName + '-' +plan.subTaskName"
               placement="top"
               :disabled="!isSimulationParticipantTasksOverflow"
           >
@@ -105,7 +105,7 @@
                 ref="simulationParticipantTasksRef"
                 class="info-value dark-value text-ellipsis"
             >
-              {{ plan.simulationParticipantTasks || "-" }}
+              {{ plan.taskName + '-' +plan.subTaskName || "-" }}
             </span>
           </el-tooltip>
         </div>
@@ -156,8 +156,8 @@
 
     <!-- 操作按钮区域 -->
     <div class="plan-actions">
-      <el-button type="info" icon="el-icon-monitor" @click="editPlan">试验任务信息</el-button>
-      <el-button icon="el-icon-edit" class="blue-btn" @click="viewDetail">编辑</el-button>
+      <el-button type="" class="blue-btn" icon="el-icon-monitor" @click="viewDetail">试验任务信息</el-button>
+      <el-button icon="el-icon-edit" class="blue-btn" @click="editPlan">编辑</el-button>
       <el-button icon="el-icon-edit" class="blue-btn" @click="viewExpectedEditing">想定编辑</el-button>
     </div>
   </el-card>
@@ -171,20 +171,7 @@
       plan: {
         type: Object,
         required: true,
-        default: () => ({
-          id: "",
-          planName: "",
-          simulationTaskName: "",
-          simulationStartTime: "",
-          simulationEndTime: "",
-          simulationCount: "",
-          simulationParticipantTasks: "",
-          secretLevel: "秘密",
-          status: "有效",
-          username: "",
-          createTime: "",
-          isScenarioEdited: false,
-        }),
+        default: () => ({}),
       },
     },
     data() {

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 519 - 458
src/views/Deduction/taskSetting/index.vue


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov