From 1a8e079823528de929eb4edb4d830384860a150c Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Mon, 2 Sep 2024 19:47:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=84=B1=E6=95=8F=E5=8D=95=E7=8B=AC=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/public.scss    | 12 ++++++------
 src/views/dataCloudMap/index.vue | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index 33c1d16..111a78c 100644
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@@ -3590,12 +3590,12 @@
               background-color: #F6F9FD;
             }
 
-            // .project-trace-table-number {
-            //   font-family: DINCondensed, DINCondensed;
-            //   // font-weight: bold;
-            //   font-size: 20px;
-            //   color: #FF844D;
-            // }
+            .project-trace-table-number {
+              font-family: DINCondensed, DINCondensed;
+              // font-weight: bold;
+              font-size: 20px;
+              color: #FF844D;
+            }
             .remind-info {
               width: 11em;
               overflow: hidden;
diff --git a/src/views/dataCloudMap/index.vue b/src/views/dataCloudMap/index.vue
index 2dedf99..65e094c 100644
--- a/src/views/dataCloudMap/index.vue
+++ b/src/views/dataCloudMap/index.vue
@@ -272,14 +272,11 @@
             <el-table v-loading="loadingTwo" class="dataMap-two-table" :data="tableTwoData" :row-class-name="tableRowClassName"  :height="tabHeader" :header-cell-style="{background:'#E8F3FC'}">  <!-- :max-height="tabHeader" -->
               <el-table-column label="项目名称" prop="projectSmallType" width="400" align="center">
                 <template slot-scope="scope">
-                  <!-- <div>{{ scope.row.enterpriseDirectory }}</div> -->
                   <dict-tag :options="dict.type.project_small_type" :value="scope.row.projectSmallType"/>
                 </template>
               </el-table-column>
               <el-table-column label="提醒内容" prop="alertContent" align="center" width="200">
                 <template slot-scope="scope">
-                  <!-- <div v-if="scope.row.startTime && scope.row.endTime">{{ scope.row.startTime }}~{{ scope.row.endTime }}</div>
-                  <div v-else>长期有效</div> -->
                   <div class="remind-info">{{ scope.row.alertContent }}</div>
                 </template>
               </el-table-column>
@@ -288,6 +285,18 @@
                   <div class="project-trace-table-number">{{ scope.row.alertTime }}</div>
                 </template>
               </el-table-column>
+              <!-- <el-table-column label="申报任务名称" prop="enterpriseDirectory" width="500" align="center"/>
+              <el-table-column label="填报时间" prop="time" align="center">
+                <template slot-scope="scope">
+                  <div v-if="scope.row.startTime && scope.row.endTime">{{ scope.row.startTime }}~{{ scope.row.endTime }}</div>
+                  <div v-else>长期有效</div>
+                </template>
+              </el-table-column>
+              <el-table-column label="已填报企业数" prop="count" align="center">
+                <template slot-scope="scope">
+                  <div class="project-trace-table-number">{{ scope.row.count }}</div>
+                </template>
+              </el-table-column> -->
             </el-table>
           </section>
         </div>