zhaoen 4 місяців тому
батько
коміт
3dc37579cc

+ 1 - 0
src/styles/ownStyle.scss

@@ -104,6 +104,7 @@
   transform: rotate(90deg);
 }
 .el-drawer__body {
+  background-color: #051733;
   padding: 16px;
   color: var(--drawer-text);
 }

+ 2 - 2
src/views/decision/testBuild/index.vue

@@ -20,8 +20,8 @@
 
       <!-- Header右侧操作按钮 -->
       <template #header-actions>
-        <el-button class="blue-btn" icon="el-icon-search" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-delete" type="danger" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
+        <el-button class="blue-btn" icon="el-icon-delete" @click="resetQuery">重置</el-button>
         <el-button class="blue-btn" icon="el-icon-plus" @click="addTask">新增试验任务</el-button>
       </template>
 

+ 7 - 8
src/views/planAndDeduction/taskMage/taskCreate.vue

@@ -229,7 +229,7 @@
                 <el-col :span="6" v-for="(item, index) in layoutList" :key="index">
                   <el-card
                       :class="`p-3 mb-2 info-card ${getCardClass(item.status)}`"
-                      style="background-color: #0e2a53"
+                      style="background-color: #0e2a53;"
                       shadow="hover"
                   >
                     <div class="flex justify-between items-start mb-2">
@@ -265,7 +265,7 @@
                 <el-col :span="6" v-for="(item, index) in guaranteeList" :key="index">
                   <el-card
                       :class="`p-3 mb-2 info-card ${getCardClass(item.status)}`"
-                      style="background-color: #0e2a53"
+                      style="background-color: #0e2a53;"
                       shadow="hover"
                   >
                     <div class="flex justify-between items-start mb-2">
@@ -622,7 +622,7 @@
       <!--:disabled="currentStep === 2 || (currentStep === 0 && !analysisComplete)"-->
       <el-button
           class="text-lg"
-          type="success"
+          type="primary"
           @click="nextStep"
           :icon="currentStep < 2 ? 'el-icon-arrow-right' : 'el-icon-check'"
       >
@@ -1024,9 +1024,9 @@ export default {
       return bgColors[index % bgColors.length];
     },
     getCardClass(status) {
-      if (status === 'extracted') return 'bg-green-50 border-l-4 border-green-500';
-      else if (status === 'toConfirm') return 'bg-yellow-50 border-l-4 border-yellow-500';
-      else if (status === 'failed') return 'bg-red-50 border-l-4 border-red-500';
+      if (status === 'extracted') return 'bg-green-50 border-l-8 border-green-500';
+      else if (status === 'toConfirm') return 'bg-yellow-50 border-l-8 border-yellow-500';
+      else if (status === 'failed') return 'bg-red-50 border-l-8 border-red-500';
       return '';
     },
     getTagClass(status) {
@@ -1130,8 +1130,7 @@ export default {
 
 .info-card {
   min-height: 160px;
-
-
+  border-style: inset;
 }
 /* 覆盖Element UI样式 */
 ::v-deep .el-upload {

+ 35 - 10
src/views/planningSchem/comprehensive/components/associationTask.vue

@@ -10,7 +10,7 @@
         <!-- 仅保留步骤一内容:选择试验任务 -->
         <div class="animate-fadeIn space-y-6">
           <!-- 选择试验任务区域 -->
-          <el-card class="bg-gray-800 border-none mb-8">
+          <el-card class="border-none mb-8" style="background-color: #011d5c">
             <div class="flex items-center mb-2">
               <i class="el-icon-document mr-3 text-blue-400"></i>
               <h2 class="text-xl font-bold">选择总体任务</h2>
@@ -23,8 +23,10 @@
             <el-row :gutter="20">
               <el-col :span="8" v-for="(plan, index) in planList" :key="index">
                 <el-card
-                  :class="`bg-gray-800 border-4 border-gray-700 rounded-md transition-all duration-300 ${selectedPlan && selectedPlan.taskName === plan.taskName ? 'border-blue-500 shadow-lg transform scale-[1.02]' : ''}`"
-                >
+                    @click.native="handleTaskSelect(plan)"
+                    class="task-card"
+                    :class="{ 'task-card--active': selectedPlan && selectedPlan.taskName === plan.taskName }"
+                   >
                   <div class="flex justify-between items-start mb-3">
                     <h3 class="text-lg font-bold"> {{ plan.taskName || "-" }}</h3>
                     <!--<el-tag effect="dark" class="info-value">-->
@@ -41,18 +43,18 @@
                   <el-button
                     :class="[
         'w-full font-medium transition-all duration-200',
-        selectedPlan && selectedPlan.taskName === plan.taskName ? 'bg-blue-600 hover:bg-blue-700 text-white' : 'bg-gray-700 hover:bg-gray-600 text-gray-200'
+        selectedPlan && selectedPlan.id === plan.id ? 'bg-blue-600 hover:bg-blue-700 text-white' : 'bg-gray-700 hover:bg-gray-600 text-gray-200'
       ]"
-                    @click.stop="handleTaskSelect(plan)"
+
                   >
-                    {{ selectedPlan && selectedPlan.taskName === plan.taskName? '✅ 已选择' : '选择此总体任务' }}
+                    {{ selectedPlan && selectedPlan.id === plan.id? '✅ 已选择' : '选择此总体任务' }}
                   </el-button>
                 </el-card>
               </el-col>
             </el-row>
           </el-card>
 
-          <el-card v-if="selectedPlan" class="bg-gray-800 border-none mb-8">
+          <el-card v-if="selectedPlan" class="border-none mb-8" style="background-color: #011d5c">
             <div class="flex items-center mb-2">
               <i class="el-icon-document mr-3 text-blue-400"></i>
               <h2 class="text-xl font-bold">选择子任务</h2>
@@ -61,7 +63,9 @@
             <el-row :gutter="20">
               <el-col :span="8" v-for="(plan, index) in subPlanList" :key="index">
                 <el-card
-                  :class="`bg-gray-800 border-4 border-gray-700 rounded-md transition-all duration-300 ${selectedSubPlan && selectedSubPlan.subTaskName === plan.subTaskName ? 'border-blue-500 shadow-lg transform scale-[1.02]' : ''}`"
+                    @click.native="handleTaskSelectSub(plan)"
+                    class="task-card"
+                    :class="{ 'task-card--active': selectedSubPlan && selectedSubPlan.id === plan.id }"
                 >
 
                   <div class="flex justify-between items-start mb-3">
@@ -83,7 +87,7 @@
         'w-full font-medium transition-all duration-200',
         selectedSubPlan && selectedSubPlan.subTaskName === plan.subTaskName ? 'bg-blue-600 hover:bg-blue-700 text-white' : 'bg-gray-700 hover:bg-gray-600 text-gray-200'
       ]"
-                    @click.stop="handleTaskSelectSub(plan)"
+
                   >
                     {{ selectedSubPlan && selectedSubPlan.subTaskName === plan.subTaskName ? '✅ 已选择' : '选择此任务' }}
                   </el-button>
@@ -98,7 +102,7 @@
       <div class="flex justify-center gap-4 mt-8">
         <el-button class="blue-btn" @click="back">返回</el-button>
         <el-button
-          class="blue-btn"
+          type="primary"
           @click="confirmSelection"
           :disabled="!selectedTask && !selectedSubPlan"
         >
@@ -221,6 +225,27 @@ export default {
 </script>
 
 <style scoped>
+.task-card {
+  background: #09264c;
+  border: 1px solid #334155;
+  border-radius: 8px;
+  padding: 16px;
+  color: #e2e8f0;
+  transition: all 0.25s ease;
+  display: flex; flex-direction: column; justify-content: space-between;
+  height: 100%;
+}
+.task-card:hover {
+  border-color: #3b82f6;
+  box-shadow: 0 4px 12px rgba(0,0,0,0.5);
+  transform: translateY(-2px);
+  cursor: pointer;
+}
+.task-card--active {
+  border: 2px solid #3b82f6;
+  box-shadow: 0 0 10px rgba(59,130,246,0.7);
+}
+
 .el-card__header {
   background-color: transparent !important;
   border-bottom: none !important;

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

@@ -21,9 +21,9 @@
 
       <!-- Header右侧操作按钮 -->
       <template #header-actions>
-        <el-button type="primary" @click="handleQuery">查询</el-button>
-        <el-button class="blue-btn" @click="resetQuery">重置</el-button>
-        <el-button class="blue-btn" @click="handleAdd">新增</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
+        <el-button class="blue-btn" icon="el-icon-delete" @click="resetQuery">重置</el-button>
+        <el-button class="blue-btn" icon="el-icon-plus" @click="handleAdd">新增</el-button>
       </template>
 
       <!-- 主要内容 -->

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

@@ -16,7 +16,7 @@
 
       <div class="flex gap-4">
         <!-- 左侧侧边栏 -->
-        <div class="relative max-w-md mx-auto p-6 bg-gray-400 bg-opacity-20 backdrop-blur-lg border-gray-50 rounded-xl">
+        <div style="background-color: rgb(22, 45, 85)" class="relative max-w-md mx-auto p-6 bg-opacity-20 backdrop-blur-lg border-gray-50 rounded-xl">
           <div class="flex items-center border-blue-400 border-b mb-4">
             <h3 class="text-lg font-bold" style="color: #4fc2f7">任务信息</h3>
           </div>
@@ -303,7 +303,7 @@
         </div>
 
         <!-- 右侧主内容区 -->
-        <div class="flex-1 space-y-4 p-6 bg-gray-400 bg-opacity-20 backdrop-blur-lg border-gray-50 rounded-xl">
+        <div style="background-color: rgb(22, 45, 85)" class="flex-1 space-y-4 p-6 bg-opacity-20 backdrop-blur-lg border-gray-50 rounded-xl">
 
           <div class="flex items-center mb-4">
             <h3 class="text-lg font-bold" style="color: #4fc2f7">方案信息</h3>

+ 2 - 2
src/views/programPlanning/collaborativePlanning/index.vue

@@ -21,8 +21,8 @@
 
       <!-- Header右侧操作按钮 -->
       <template #header-actions>
-        <el-button type="primary" @click="handleQuery">查询</el-button>
-        <el-button class="blue-btn" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
+        <el-button class="blue-btn" icon="el-icon-delete" @click="resetQuery">重置</el-button>
         <!--<el-button class="blue-btn" @click="handleAdd">新增</el-button>-->
       </template>