From 3b86104eeb361c5f54ac96040d4d11b621d57dc8 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 18 Jul 2024 14:09:55 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E9=A6=96=E9=A1=B5=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api.js                                |  2 +-
 .../modules/SearchAndWarningCard.vue          | 35 +++++++++++++++----
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index 4db1a4c..1005a25 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -132,7 +132,7 @@ const getFileInfo = (params) => getAction('/sys/oss/file/queryById', params)
 // 标准选择框，分页查询标准数据
 const getStandardList = (params) => getAction('/laws/standard/common/getManyStandardSelectionBox', params)
 
-// 市场法规清单选择框，分页查询数据(无权限)
+// 市场法规清单选择框，分页查询数据(无权限),首页也用
 const getMarketRegulationsList = (params) => getAction('/laws/marketStandard/queryPageListByOther', params)
 
 // 内部工作组，左侧树查询
diff --git a/src/views/dashboard/modules/SearchAndWarningCard.vue b/src/views/dashboard/modules/SearchAndWarningCard.vue
index 533ec5c..62085e4 100644
--- a/src/views/dashboard/modules/SearchAndWarningCard.vue
+++ b/src/views/dashboard/modules/SearchAndWarningCard.vue
@@ -48,6 +48,7 @@
 <script>
 import { getAction } from '@api/manage'
 import { StandardSource } from '@/enums/commonEnums'
+import { getMarketRegulationsList } from '../../../api/api'
 
 export default {
   name: 'SearchAndWarningCard',
@@ -197,7 +198,7 @@ export default {
         {
           title: '国家/地区',
           align: 'left',
-          dataIndex: 'country',
+          dataIndex: 'country_dictText',
           width: 100,
           scopedSlots: { customRender: 'text' },
           show: () => {
@@ -209,7 +210,7 @@ export default {
         {
           title: '清单编号',
           align: 'left',
-          dataIndex: 'listNumber',
+          dataIndex: 'manifestNo',
           width: 100,
           scopedSlots: { customRender: 'text' },
           show: () => {
@@ -221,7 +222,7 @@ export default {
         {
           title: '清单名称',
           align: 'left',
-          dataIndex: 'listName',
+          dataIndex: 'manifestName',
           width: 100,
           scopedSlots: { customRender: 'text' },
           show: () => {
@@ -233,7 +234,7 @@ export default {
         {
           title: '清单版本',
           align: 'left',
-          dataIndex: 'listVersion',
+          dataIndex: 'manifestVersion',
           width: 100,
           scopedSlots: { customRender: 'text' },
           show: () => {
@@ -245,7 +246,7 @@ export default {
         {
           title: '驾驶位置',
           align: 'left',
-          dataIndex: 'drivingPosition',
+          dataIndex: 'drivePosition_dictText',
           width: 100,
           scopedSlots: { customRender: 'text' },
           show: () => {
@@ -368,8 +369,28 @@ export default {
       params.order = 'desc'
       this.loading = true
       // TODO: 暂时没有对接接口
-      let url = this.url.list
-      getAction(url, params).then((res) => {
+      // let url = this.url.list
+      let func = null
+      switch (this.warningTab) {
+        case 'lastStorageStandards': // 最新入库标准
+          func = null
+          break
+        case 'marketUpdates': // 市场更新情况
+          func = getMarketRegulationsList
+          params.manifestStatus = '1' // 已发布
+          params.homeFlag = '1' // 标识首页的查询
+          break
+        case 'lastStorageEnterpriseStandard': // 最新入库企标
+          func = null
+          break
+        case 'latestInterpretationStandards': // 最新解读标准
+          func = null
+          break
+        case 'implementStandards': // 将实施标准
+          func = null
+          break
+      }
+      func(params).then((res) => {
         if (res.success) {
           this.dataSource = res.result.records || res.result
           if (res.result.total) {