From f8331485341314c3d0613079d4981887a111568c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 24 十月 2024 17:20:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/system/data-manage/data-detail/list.js |  107 ++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 69 insertions(+), 38 deletions(-)

diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js
index fea4339..30f7f92 100644
--- a/src/views/system/data-manage/data-detail/list.js
+++ b/src/views/system/data-manage/data-detail/list.js
@@ -1285,6 +1285,9 @@
           icon: 'el-icon-wind-power',
           dataList: [
             {
+              label: '鎬绘暟'
+            },
+            {
               label: '瀹屾暣'
             },
             {
@@ -1294,11 +1297,17 @@
               label: '寮傚父'
             },
             {
-              label: '浠婃棩鍙敤鐜�'
+              label: '褰曞儚鍙敤鐜�'
             },
           ]
         }
-      ]
+      ],
+      options: [
+        { label: '瀹屾暣',value: 1 },
+        { label: '闂存瓏',value: 0 },
+        { label: '寮傚父',value: -1 },
+      ],
+      optionsName: '褰曞儚鐘舵��',
     },
     {
       title: "閮ㄧ骇宸℃褰曞儚鍙敤鐜�",
@@ -1365,6 +1374,9 @@
           icon: 'el-icon-wind-power',
           dataList: [
             {
+              label: '鎬绘暟'
+            },
+            {
               label: '瀹屾暣'
             },
             {
@@ -1374,11 +1386,17 @@
               label: '寮傚父'
             },
             {
-              label: '浠婃棩鍙敤鐜�'
+              label: '褰曞儚鍙敤鐜�'
             },
           ]
         }
-      ]
+      ],
+      options: [
+        { label: '瀹屾暣',value: 1 },
+        { label: '闂存瓏',value: 0 },
+        { label: '寮傚父',value: -1 },
+      ],
+      optionsName: '褰曞儚鐘舵��',
     },
     {
       title: "鏍囨敞姝ｇ‘鐜�",
@@ -1877,6 +1895,9 @@
           icon: 'el-icon-wind-power',
           dataList: [
             {
+              label: '鎬绘暟'
+            },
+            {
               label: '瀹屾暣'
             },
             {
@@ -1886,11 +1907,17 @@
               label: '寮傚父'
             },
             {
-              label: '浠婃棩閲嶇偣鍙敤鐜�'
+              label: '褰曞儚鍙敤鐜�'
             },
           ]
         }
-      ]
+      ],
+      options: [
+        { label: '瀹屾暣',value: 1 },
+        { label: '闂存瓏',value: 0 },
+        { label: '寮傚父',value: -1 },
+      ],
+      optionsName: '褰曞儚鐘舵��',
     },
     {
       title: '閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜�',
@@ -1935,63 +1962,62 @@
         {
           "label": "osd鏃堕棿鏄惁姝ｇ‘",
           "align": "center",
-          "prop": "osdTimeCorrect",
+          "prop": "osdTimeCorrectText",
           width: 150
         },
         {
           "label": "osd閫氶亾鍚嶆槸鍚︽纭�",
           "align": "center",
-          "prop": "osdNameCorrect",
+          "prop": "osdNameCorrectText",
           width: 150
         },
         {
           "label": "osd鐪佹槸鍚︽纭�",
           "align": "center",
-          "prop": "osdProvinceCorrect",
+          "prop": "osdProvinceCorrectText",
           width: 150
         },
         {
           "label": "osd甯傛槸鍚︽纭�",
           "align": "center",
-          "prop": "osdCityCorrect",
+          "prop": "osdCityCorrectText",
           width: 150
         },
         {
           "label": "osd鍖烘槸鍚︽纭�",
           "align": "center",
-          "prop": "osdPartCorrect",
+          "prop": "osdPartCorrectText",
           width: 150
         },
-        {
-          "label": "osd宸︿笅瑙掓槸鍚︽纭�",
-          "align": "center",
-          "prop": "osdLbCorrect",
-          width: 150
-        },
-
       ],
       card: [
         {
           icon: 'el-icon-wind-power',
           dataList: [
             {
-              label: '鐐逛綅鍚嶇О鏍囨敞姝ｇ‘鏁�'
+              label: '鎬绘暟'
             },
             {
-              label: '鐐逛綅鍚嶇О鏍囨敞閿欒鏁�'
+              label: 'OSD姝ｇ‘鏁�'
             },
             {
-              label: 'osd鏃堕棿鏍囨敞姝ｇ‘鏁�'
+              label: 'OSD閿欒鏁�'
             },
             {
-              label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
+              label: 'OSD鏈煡鏁�'
             },
             {
-              label: '浠婃棩鏍囨敞姝ｇ‘鐜�'
+              label: '閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜�'
             },
           ]
         }
       ],
+      options: [
+        { label: '姝ｇ‘',value: 1 },
+        { label: '閿欒',value: -1 },
+        { label: '鏈煡',value: 0 },
+      ],
+      optionsName: 'OSD鐘舵��',
     },
     {
       title: '閲嶇偣鐐逛綅鏍℃椂姝ｇ‘鐜�',
@@ -2036,57 +2062,62 @@
         {
           "label": "osd鏃堕棿鏄惁姝ｇ‘",
           "align": "center",
-          "prop": "osdTimeCorrect",
+          "prop": "osdTimeCorrectText",
           width: 150
         },
         {
           "label": "osd閫氶亾鍚嶆槸鍚︽纭�",
           "align": "center",
-          "prop": "osdNameCorrect",
+          "prop": "osdNameCorrectText",
           width: 150
         },
         {
           "label": "osd鐪佹槸鍚︽纭�",
           "align": "center",
-          "prop": "osdProvinceCorrect",
+          "prop": "osdProvinceCorrectText",
           width: 150
         },
         {
           "label": "osd甯傛槸鍚︽纭�",
           "align": "center",
-          "prop": "osdCityCorrect",
+          "prop": "osdCityCorrectText",
           width: 150
         },
         {
           "label": "osd鍖烘槸鍚︽纭�",
           "align": "center",
-          "prop": "osdPartCorrect",
+          "prop": "osdPartCorrectText",
           width: 150
         },
-        {
-          "label": "osd宸︿笅瑙掓槸鍚︽纭�",
-          "align": "center",
-          "prop": "osdLbCorrect",
-          width: 150
-        },
-
       ],
       card: [
         {
           icon: 'el-icon-wind-power',
           dataList: [
             {
-              label: 'osd鏃堕棿鏍囨敞姝ｇ‘鏁�'
+              label: '鎬绘暟'
             },
             {
-              label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
+              label: 'OSD姝ｇ‘鏁�'
             },
             {
-              label: '浠婃棩鏍℃椂姝ｇ‘鐜�'
+              label: 'OSD閿欒鏁�'
+            },
+            {
+              label: 'OSD鏈煡鏁�'
+            },
+            {
+              label: '閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜�'
             },
           ]
         }
       ],
+      options: [
+        { label: '姝ｇ‘',value: 1 },
+        { label: '閿欒',value: -1 },
+        { label: '鏈煡',value: 0 },
+      ],
+      optionsName: 'OSD鏃堕棿',
       showList: [
         { key: 0, label: `璁惧鍘傚晢`, visible: false },
         { key: 1, label: `琛屾斂鍖哄煙`, visible: false },

--
Gitblit v1.8.0