Browse Source

双碳新闻接口数据

tianyabing 2 years ago
parent
commit
4dfa4e9d33

+ 14 - 12
src/components/doubleCarbon/overview/charts/doubleCarbonNews.vue

@@ -13,18 +13,20 @@
       </template>
     </a-table>
 
-    <a-modal title="双碳新闻" v-model="showNews" width="60%" :footer="null" centered style="height: 500px">
-      <p style="font-size: 20px;font-weight: bold;color:#000;">{{ currNews.tital }}</p>
-      <div style="margin-bottom:10px;border-bottom: 1px solid #CCCCCC;">{{ currNews.date }}</div>
-      <div
-          style="max-height: calc(100vh - 300px);overflow:auto;background: rgba(10,100,100,0.05);font-size:16px;"
-          v-if="currNews.content && currNews.content.indexOf(`<p>`) != -1"
-          v-html="currNews.content"
-      ></div>
-      <p v-else style="font-size: 16px;font-weight:400;color:#000;background: rgba(10,100,100,0.05);">
-        {{ currNews.content }}
-      </p>
-      <div style="margin-top:10px;border-top: 1px solid #CCCCCC;">{{ currNews.writer }}</div>
+    <a-modal title="双碳新闻" v-model="showNews" width="60%" :footer="null" centered >
+      <div style="height: 500px;overflow-y: auto">
+        <p style="font-size: 20px;font-weight: bold;color:#000;">{{ currNews.tital }}</p>
+        <div style="margin-bottom:10px;border-bottom: 1px solid #CCCCCC;">{{ currNews.date }}</div>
+        <div
+            style="max-height: calc(100vh - 300px);overflow:auto;background: rgba(10,100,100,0.05);font-size:16px;"
+            v-if="currNews.content && currNews.content.indexOf(`<p>`) != -1"
+            v-html="currNews.content"
+        ></div>
+        <p v-else style="font-size: 16px;font-weight:400;color:#000;background: rgba(10,100,100,0.05);">
+          {{ currNews.content }}
+        </p>
+        <div style="margin-top:10px;border-top: 1px solid #CCCCCC;">{{ currNews.writer }}</div>
+      </div>
     </a-modal>
 
   </div>

+ 10 - 2
src/components/doubleCarbon/overview/doubleCarbonOverview.vue

@@ -101,7 +101,13 @@ export default {
       });
     },
     getNewsData() {
-      return apiCarbonOverview.getCarbonNews(this.queryData).then((res) => {
+      let params = {
+        timeRange: {
+          startDate: '2022/04/25',
+          endDate: '2022/06/07'
+        }
+      }
+      return apiCarbonOverview.getCarbonNews(params).then((res) => {
         this.newsData = res;
       });
     },
@@ -177,7 +183,9 @@ export default {
                 <a-divider style="margin: 0; padding: 0"></a-divider>
               </div>
               <div class="doubleCarbon-overview-news">
-                <DoubleCarbonNews :data="newsData" />
+                <div style="height: 280px;overflow-y: auto">
+                  <DoubleCarbonNews :data="newsData" />
+                </div>
               </div>
             </Card>
           </div>