From ea1d35aa1fe33c440d209273631eb4dcd8ed15d9 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Tue, 16 May 2023 17:52:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/estate/shrim-price/PriceDrawerWeek.vue | 4 +++-
 src/views/base/estate/shrim-price/shrim-price-week.ts | 9 +++------
 src/views/visualization/components/DXJGWEEK.vue       | 7 ++++++-
 src/views/visualization/components/Map.vue            | 6 ++++++
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/views/base/estate/shrim-price/PriceDrawerWeek.vue b/src/views/base/estate/shrim-price/PriceDrawerWeek.vue
index 408cc522..076b9b42 100644
--- a/src/views/base/estate/shrim-price/PriceDrawerWeek.vue
+++ b/src/views/base/estate/shrim-price/PriceDrawerWeek.vue
@@ -31,9 +31,11 @@
     setDrawerProps({ confirmLoading: false })
     isUpdate.value = data?.isUpdate
     if (unref(isUpdate)) {
+      console.log(data)
+
       await setFieldsValue({
         id: data.id,
-        week: data.week.toString(),
+        week: data.week,
         year: dayjs(data.year.toString()),
         price: data.price,
       })
diff --git a/src/views/base/estate/shrim-price/shrim-price-week.ts b/src/views/base/estate/shrim-price/shrim-price-week.ts
index cd87974c..189030c4 100644
--- a/src/views/base/estate/shrim-price/shrim-price-week.ts
+++ b/src/views/base/estate/shrim-price/shrim-price-week.ts
@@ -11,10 +11,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '周',
-    dataIndex: 'week',
-    customRender: ({ text }) => {
-      return '第 ' + text + ' 周'
-    },
+    dataIndex: 'week_label',
   },
   {
     title: '价格',
@@ -58,7 +55,7 @@ export const searchFormSchema: FormSchema[] = [
         return data
       },
       labelField: 'name',
-      valueField: 'key',
+      valueField: 'id',
     },
     colProps: { span: 8 },
   },
@@ -96,7 +93,7 @@ export const accountFormSchema: FormSchema[] = [
         return data
       },
       labelField: 'name',
-      valueField: 'key',
+      valueField: 'id',
     },
   },
   {
diff --git a/src/views/visualization/components/DXJGWEEK.vue b/src/views/visualization/components/DXJGWEEK.vue
index c1513396..0e4d2676 100644
--- a/src/views/visualization/components/DXJGWEEK.vue
+++ b/src/views/visualization/components/DXJGWEEK.vue
@@ -6,7 +6,7 @@
         <Pagination
           v-model:current="current"
           v-model:pageSize="pageSize"
-          :total="52"
+          :total="48"
           :showSizeChanger="false"
           @change="changePage"
         />
@@ -110,6 +110,7 @@
             },
             axisLabel: {
               color: '#fff',
+              rotate: 45,
             },
           },
           yAxis: [
@@ -148,6 +149,9 @@
         Data.x_axis = resData.x_axis
         Data.series = resData.series
 
+        current.value = Math.ceil(resData.c_week / pageSize.value)
+        console.log(current.value)
+
         chartsInit()
       }
 
@@ -156,6 +160,7 @@
       })
 
       return {
+        Data,
         changePage,
         chartRef,
         current,
diff --git a/src/views/visualization/components/Map.vue b/src/views/visualization/components/Map.vue
index de1a86a9..06feef8f 100644
--- a/src/views/visualization/components/Map.vue
+++ b/src/views/visualization/components/Map.vue
@@ -139,6 +139,12 @@
               label: {
                 show: false,
                 color: '#fff',
+                normal: {
+                  show: isBack.value,
+                  textStyle: {
+                    color: '#fff',
+                  },
+                },
               },
               itemStyle: {
                 // areaColor: {