From 0f04abbcb671bb52231da99a171da7bdd10f2bdd Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 22 Jul 2024 11:35:26 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E9=A6=96=E9=A1=B5=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dashboard.js                          | 13 +++++--
 .../modules/SearchAndWarningCard.vue          | 34 +++++++------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index cd9e525..298a04b 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -47,8 +47,14 @@ const getAdvancedSearchClause = (params) => postAction('/home/lawsHomeSearch/get
 // 高级检索-导出
 const exportAdvancedSearch = (params) => postDownFile('/home/lawsHomeSearch/advancedSearchExportExcel', params)
 
-// 最新入库标准
+// 最新解读标准
 const getHomeNewStandard = (params) => getAction('/process/standardInterpretFlow/homeNewestStandardInterpret', params)
+// 最新入库标准
+const getNewestEnterStandard = (params) => getAction('/laws/localTool/standardEarlyWarning/newAddStandard', params)
+// 最新入库企标
+const getNewestEnterEnStandard = (params) => getAction('/laws/localTool/standardEarlyWarning/newAddEsStandard', params)
+// 将实施标准
+const getWillImplementStandards = (params) => getAction('/laws/localTool/standardEarlyWarning/latestImplement', params)
 
 export {
   getSearchHistoryData,
@@ -72,5 +78,8 @@ export {
   getAdvancedSearchAll,
   getAdvancedSearchClause,
   exportAdvancedSearch,
-  getHomeNewStandard
+  getHomeNewStandard,
+  getNewestEnterStandard,
+  getNewestEnterEnStandard,
+  getWillImplementStandards
 }
diff --git a/src/views/dashboard/modules/SearchAndWarningCard.vue b/src/views/dashboard/modules/SearchAndWarningCard.vue
index e5a01f0..09ef59a 100644
--- a/src/views/dashboard/modules/SearchAndWarningCard.vue
+++ b/src/views/dashboard/modules/SearchAndWarningCard.vue
@@ -55,7 +55,12 @@
 <script>
 import { StandardSource } from '@/enums/commonEnums'
 import { getMarketRegulationsList } from '../../../api/api'
-import { getHomeNewStandard } from '@api/dashboard'
+import {
+  getHomeNewStandard,
+  getNewestEnterStandard,
+  getNewestEnterEnStandard,
+  getWillImplementStandards
+} from '@api/dashboard'
 import StandardResolutionSheetModal
   from '@views/standardRegulationLibrary/foreignStandard/detail/modules/StandardResolutionSheetModal'
 
@@ -79,19 +84,6 @@ export default {
       warningTab: '', // 预警当前tab
       loading: false,
       columns: [
-        { // 来源
-          title: this.$t('dashboard.tableList.source'),
-          align: 'left',
-          dataIndex: 'source_dictText',
-          width: 60,
-          scopedSlots: { customRender: 'text' },
-          show: () => {
-            return [
-              this.tabList[0].key,
-              this.tabList[4].key
-            ].includes(this.warningTab)
-          }
-        },
         { // 标准编号
           title: this.$t('standardNumber'),
           align: 'left',
@@ -137,7 +129,7 @@ export default {
         { // 新生产车实施日期
           title: this.$t('dashboard.advancedSearch.newProduceMaterialDate'),
           align: 'left',
-          dataIndex: 'newProduceModelImplementationDate',
+          dataIndex: 'newProductImplDate',
           width: 140,
           scopedSlots: { customRender: 'text' },
           show: () => {
@@ -149,7 +141,7 @@ export default {
         { // 新认证车实施日期
           title: this.$t('dashboard.advancedSearch.newAttestationMaterialDate'),
           align: 'left',
-          dataIndex: 'newAuthenticationModelImplementationDate',
+          dataIndex: 'newAuthImplDate',
           width: 140,
           scopedSlots: { customRender: 'text' },
           show: () => {
@@ -186,7 +178,7 @@ export default {
         { // 标准状态
           title: this.$t('standardState'),
           align: 'left',
-          dataIndex: 'status_dictText',
+          dataIndex: 'standardState_dictText',
           width: 100,
           scopedSlots: { customRender: 'text' },
           show: () => {
@@ -200,7 +192,7 @@ export default {
         { // 代替标准编号
           title: this.$t('dashboard.tableList.substituteStandardNumber'),
           align: 'left',
-          dataIndex: 'standardNumber2',
+          dataIndex: 'substituteStandardNumber',
           width: 100,
           scopedSlots: { customRender: 'text' },
           show: () => {
@@ -395,7 +387,7 @@ export default {
       let func = null
       switch (this.warningTab) {
         case 'lastStorageStandards': // 最新入库标准
-          func = null
+          func = getNewestEnterStandard
           break
         case 'marketUpdates': // 市场更新情况
           func = getMarketRegulationsList
@@ -403,13 +395,13 @@ export default {
           params.homeFlag = '1' // 标识首页的查询
           break
         case 'lastStorageEnterpriseStandard': // 最新入库企标
-          func = null
+          func = getNewestEnterEnStandard
           break
         case 'latestInterpretationStandards': // 最新解读标准
           func = getHomeNewStandard
           break
         case 'implementStandards': // 将实施标准
-          func = null
+          func = getWillImplementStandards
           break
       }
       func(params).then((res) => {