zhaoen 4 ヶ月 前
コミット
ebc5aba8c3

+ 3 - 3
src/components/Components/TaskUserCard.vue

@@ -104,13 +104,13 @@
     </div>
 
     <div class="plan-actions">
-      <el-button icon="el-icon-view" type="success" @click="viewDetail">
+      <el-button icon="el-icon-view" class="blue-btn" @click="viewDetail">
         详情
       </el-button>
-      <el-button icon="el-icon-tickets" type="info" @click="viewChildsDetail">
+      <el-button icon="el-icon-tickets" class="blue-btn" @click="viewChildsDetail">
         子任务
       </el-button>
-      <el-button icon="el-icon-edit" @click="editPlan">编辑</el-button>
+      <el-button icon="el-icon-edit" class="blue-btn" @click="editPlan">编辑</el-button>
     </div>
   </el-card>
 </template>

+ 5 - 5
src/views/Deduction/taskSetting/Scenarioediting.vue

@@ -34,7 +34,7 @@
             v-for="plan in planList"
             :key="plan.id + '-' + plan.createTime"
             :plan="plan"
-            @edit="openEditDialog(plan)"
+            @edit="openExpectedEditDialog(plan)"
             @view-detail="viewDetails(plan)"
         />
         <el-empty v-else description="暂无方案数据" />
@@ -126,7 +126,7 @@
             <p class="section-desc">请选择要关联的总体任务,系统将根据总体任务推荐对应的子任务</p>
 
             <el-row :gutter="20">
-              <el-col :span="8" v-for="(task, index) in taskList" :key="index">
+              <el-col :span="8" class="mb-4" v-for="(task, index) in taskList" :key="index">
                 <div
                     class="task-card"
                     :class="{ 'task-card--active': selectedTask && selectedTask.id === task.id }"
@@ -153,7 +153,7 @@
               <i class="el-icon-document mr-2"></i> 选择子任务
             </h3>
             <el-row :gutter="20">
-              <el-col :span="8" v-for="(task, index) in subTaskList" :key="index">
+              <el-col :span="8" class="mb-4" v-for="(task, index) in subTaskList" :key="index">
                 <div
                     class="task-card"
                     :class="{ 'task-card--active': selectedSubTask && selectedSubTask.id === task.id }"
@@ -883,7 +883,7 @@ export default {
 .task-select-section { margin-top: 20px; }
 .section-desc { font-size: 13px; color: #94a3b8; margin-bottom: 14px; }
 .task-card {
-  background: #1e293b;
+  background: #09264c;
   border: 1px solid #334155;
   border-radius: 8px;
   padding: 16px;
@@ -902,7 +902,7 @@ export default {
   border: 2px solid #3b82f6;
   box-shadow: 0 0 10px rgba(59,130,246,0.7);
 }
-.task-title { font-size: 15px; font-weight: 600; color: #fff; }
+.task-title { height:45px;font-size: 15px; font-weight: 600; color: #fff; }
 .task-info { font-size: 13px; line-height: 1.6; margin-bottom: 12px; }
 .task-btn { width: 100%; font-weight: 600; border-radius: 6px; }
 

+ 4 - 4
src/views/Deduction/taskSetting/index.vue

@@ -127,7 +127,7 @@
             <p class="section-desc">请选择要关联的总体任务,系统将根据总体任务推荐对应的子任务</p>
 
             <el-row :gutter="20">
-              <el-col :span="8" v-for="(task, index) in taskList" :key="index">
+              <el-col :span="8" class="mb-4" v-for="(task, index) in taskList" :key="index">
                 <div
                     class="task-card"
                     :class="{ 'task-card--active': selectedTask && selectedTask.id === task.id }"
@@ -154,7 +154,7 @@
               <i class="el-icon-document mr-2"></i> 选择子任务
             </h3>
             <el-row :gutter="20">
-              <el-col :span="8" v-for="(task, index) in subTaskList" :key="index">
+              <el-col :span="8" class="mb-4" v-for="(task, index) in subTaskList" :key="index">
                 <div
                     class="task-card"
                     :class="{ 'task-card--active': selectedSubTask && selectedSubTask.id === task.id }"
@@ -870,7 +870,7 @@ export default {
 .task-select-section { margin-top: 20px; }
 .section-desc { font-size: 13px; color: #94a3b8; margin-bottom: 14px; }
 .task-card {
-  background: #1e293b;
+  background: #09264c;
   border: 1px solid #334155;
   border-radius: 8px;
   padding: 16px;
@@ -889,7 +889,7 @@ export default {
   border: 2px solid #3b82f6;
   box-shadow: 0 0 10px rgba(59,130,246,0.7);
 }
-.task-title { font-size: 15px; font-weight: 600; color: #fff; }
+.task-title { height:45px;font-size: 15px; font-weight: 600; color: #fff; }
 .task-info { font-size: 13px; line-height: 1.6; margin-bottom: 12px; }
 .task-btn { width: 100%; font-weight: 600; border-radius: 6px; }
 

+ 1 - 1
src/views/Deduction/taskSetting/processcontrol.vue

@@ -34,7 +34,7 @@
             v-for="plan in planList"
             :key="plan.id + '-' + plan.createTime"
             :plan="plan"
-            @edit="openEditDialog(plan)"
+            @edit="openExpectedEditDialog(plan)"
             @view-detail="viewDetails(plan)"
         />
         <el-empty v-else description="暂无方案数据" />

+ 11 - 15
src/views/decision/testBuild/index.vue

@@ -61,7 +61,7 @@
     <DarkDrawer
         :show-footer="false"
         :visible.sync="drawerVisible"
-        size="50%"
+        size="55%"
         title="选择方案"
     >
       <!-- 选择总体任务 -->
@@ -72,14 +72,14 @@
         <p class="section-desc">请选择要关联的总体任务,系统将根据总体任务推荐对应的子任务</p>
 
         <el-row :gutter="20">
-          <el-col :span="8" v-for="(task, index) in taskList" :key="index">
+          <el-col :span="8" class="mb-4" v-for="(task, index) in taskList" :key="index">
             <div
                 class="task-card"
                 :class="{ 'task-card--active': selectedTask && selectedTask.id === task.id }"
                 @click="handleTaskSelect(task)"
             >
               <div class="flex justify-between items-center mb-3">
-                <h4 class="task-title">{{ task.taskName }}</h4>
+                <h4 class="task-title">{{ task.taskName || "-" }}</h4>
               </div>
               <div class="task-info">
                 <li>任务代号: {{ task.taskCode || "-" }}</li>
@@ -98,8 +98,8 @@
         <h3 class="section-title">
           <i class="el-icon-document mr-2"></i> 选择子任务
         </h3>
-        <el-row :gutter="20">
-          <el-col :span="8" v-for="(task, index) in subTaskList" :key="index">
+        <el-row :gutter="20" >
+          <el-col :span="8" class="mb-4" v-for="(task, index) in subTaskList" :key="index">
             <div
                 class="task-card"
                 :class="{ 'task-card--active': selectedSubTask && selectedSubTask.id === task.id }"
@@ -209,8 +209,8 @@
         </el-row>
       </div>
       <div class="pt-4 w-full flex justify-center">
-        <el-button type="info" @click="drawerVisible = false">取消</el-button>
-        <el-button @click="handleConfirm">确定</el-button>
+        <el-button class="blue-btn" @click="drawerVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleConfirm">确定</el-button>
       </div>
     </DarkDrawer>
 
@@ -313,7 +313,6 @@
                 <el-input
                     v-model="createForm.simulationName"
                     placeholder="例如:2024年度实弹保障任务"
-                    class="bg-form-input"
                 />
               </el-form-item>
 
@@ -322,7 +321,6 @@
                     v-model="createForm.testTaskType"
                     placeholder="选择任务类型"
                     style="width: 100%;"
-                    class="bg-form-input"
                 >
                   <el-option v-for="item in $getDictList('test_task_type')" key="item" :value="item.dictValue"
                              :label="item.dictName"></el-option>
@@ -334,7 +332,6 @@
                     v-model="createForm.secretLevel"
                     placeholder="选择秘级"
                     style="width: 100%;"
-                    class="bg-form-input"
                 >
                   <el-option v-for="item in $getDictList('secret_level')" key="item" :value="item.dictValue"
                              :label="item.dictName"></el-option>
@@ -348,7 +345,6 @@
                     style="width: 100%;"
                     type="datetime"
                     value-format="yyyy-MM-dd HH:mm:ss"
-                    class="bg-form-input"
                 />
               </el-form-item>
               <el-form-item label="试验任务描述" prop="remarks" style="grid-column: span 2">
@@ -979,7 +975,6 @@ export default {
 
 /* 详情/新增抽屉通用样式 */
 .detail-container {
-  padding: 20px;
   height: 100%;
   box-sizing: border-box;
 }
@@ -1004,7 +999,7 @@ export default {
 
 /* 卡片样式 */
 .detail-card {
-  background-color: #1e293b;
+  background-color: #123e7f;
   border-radius: 8px;
   padding: 16px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
@@ -1035,7 +1030,7 @@ export default {
 
 /* 详情抽屉信息项背景色:深灰底色增强区分度 */
 .bg-info-item {
-  background-color: #253347;
+  background-color: #011d5c;
   padding: 10px 12px;
   border-radius: 6px;
 }
@@ -1146,7 +1141,7 @@ export default {
 }
 
 .task-card {
-  background: #1e293b;
+  background: #09264c;
   border: 1px solid #334155;
   border-radius: 8px;
   padding: 16px;
@@ -1171,6 +1166,7 @@ export default {
 }
 
 .task-title {
+  height: 45px;
   font-size: 15px;
   font-weight: 600;
   color: #fff;

+ 2 - 2
src/views/planAndDeduction/childsTask/components/childTaskCard.vue

@@ -109,10 +109,10 @@
     </div>
 
     <div class="plan-actions">
-      <el-button icon="el-icon-view" type="success" @click="viewDetail">
+      <el-button icon="el-icon-view" class="blue-btn" @click="viewDetail">
         详情
       </el-button>
-      <el-button icon="el-icon-edit" @click="editPlan">编辑</el-button>
+      <el-button icon="el-icon-edit" class="blue-btn" @click="editPlan">编辑</el-button>
     </div>
   </el-card>
 </template>

+ 0 - 3
src/views/planAndDeduction/taskMage/index.vue

@@ -226,9 +226,6 @@
           />
         </el-form-item>
       </el-form>
-      <div class="drawer-footer">
-        <el-button @click="dialogVisible = false">取消</el-button>
-      </div>
     </el-drawer>
 
     <!-- 解析方式选择弹窗 -->

+ 1 - 1
src/views/planAndDeduction/taskMage/taskCardRead.vue

@@ -92,7 +92,7 @@
         编辑
       </el-button>
       <el-button
-        type="success"
+          type="danger"
         @click="deletePlan"
       >
         删除

+ 4 - 4
src/views/planAndDeduction/taskMage/taskMage.vue

@@ -4,8 +4,8 @@
     <div class="header">
       <h1>试验任务管理</h1>
       <div class="header-controls">
-        <el-button icon="el-icon-close" @click="cloes">关闭</el-button>
-        <el-button type="success" icon="el-icon-download" @click="saveTask">暂存</el-button>
+        <el-button icon="el-icon-close" class="blue-btn" @click="cloes">关闭</el-button>
+        <el-button class="blue-btn" icon="el-icon-download" @click="saveTask">暂存</el-button>
         <el-button type="primary" icon="el-icon-plus" @click="saveTask">保存信息</el-button>
       </div>
     </div>
@@ -187,10 +187,10 @@
             {{ n.subTaskName }}
           </h3>
           <div class="header-controls">
-            <el-button icon="el-icon-plus" @click="addMissile(n)">
+            <el-button icon="el-icon-plus" class="blue-btn" @click="addMissile(n)">
               配置兵力
             </el-button>
-            <el-button icon="el-icon-delete" @click="deleteTask(n)">
+            <el-button icon="el-icon-delete" class="blue-btn" @click="deleteTask(n)">
               删除子任务
             </el-button>
           </div>

+ 3 - 3
src/views/planningSchem/comprehensive/overallPlanDesign.vue

@@ -4,12 +4,12 @@
       <!-- 主页面内容 -->
       <template #header-controls>
         <div class="header-actions">
-          <el-button type="success" @click="saveSolution">保存方案</el-button>
-          <el-button type="primary" @click="exportAsWord">导出为Word</el-button>
+          <el-button type="primary" @click="saveSolution">保存方案</el-button>
+          <el-button class="blue-btn" @click="exportAsWord">导出为Word</el-button>
           <el-button class="blue-btn">查看试验任务详情</el-button>
           <!-- 查看子方案下拉菜单 -->
           <el-dropdown trigger="click" @command="handleCommand">
-            <el-button type="info" icon="el-icon-folder-opened">
+            <el-button class="blue-btn" icon="el-icon-folder-opened">
               查看子方案<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">

+ 1 - 1
src/views/programPlanning/collaborativePlanning/CollaborativeCard.vue

@@ -108,7 +108,7 @@
         方案预览
       </el-button>
       <el-button
-        type="success"
+        type="primary"
         @click="selectPlan"
       >
         {{ plan.okStatus == '未确认' ? '确认':'已确认' }}

+ 1 - 1
src/views/programPlanning/collaborativePlanning/collaborativeCreate_CL.vue

@@ -97,7 +97,7 @@
               <template #default="scope">
                 <!-- 使用按钮 -->
                 <el-button
-                    type="success"
+                    type="primary"
                     size="small"
                     @click="handleUse(scope.row)"
                 >