From f54f6bbfeac7c232420c8517ee05020a2225dc42 Mon Sep 17 00:00:00 2001
From: Kane Wang <wangkane@qq.com>
Date: Tue, 5 Sep 2023 18:37:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=BF=9B=E5=BA=A6=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/db/pkg/telsale_archievement_pkg.pck      |   4 +-
 code/web/task_schedule/package-lock.json      | 130 +++++++++---------
 code/web/task_schedule/package.json           |   2 +-
 .../CallerArchievementComponent.vue           |  96 ++++++++++++-
 .../src/components/RankingListComponent.vue   |   2 +-
 .../src/views/DesktopArchievement.vue         |  36 ++++-
 .../test/DesktopArchievementTest.java         |   2 +-
 7 files changed, 189 insertions(+), 83 deletions(-)

diff --git a/code/db/pkg/telsale_archievement_pkg.pck b/code/db/pkg/telsale_archievement_pkg.pck
index b2cfaa7..d581cfe 100644
--- a/code/db/pkg/telsale_archievement_pkg.pck
+++ b/code/db/pkg/telsale_archievement_pkg.pck
@@ -202,9 +202,7 @@ CREATE OR REPLACE PACKAGE BODY TELSALE_ARCHIEVEMENT_PKG IS
                AND 签单日期 >= TO_DATE(TO_CHAR(SYSDATE,
                                            'yyyy') || '-01-01 00:00:00',
                                    'yyyy-mm-dd hh24:mi:ss')
-               AND 签单日期 < TO_DATE(TO_CHAR(SYSDATE,
-                                          'yyyy-mm') || '-01 00:00:00',
-                                  'yyyy-mm-dd hh24:mi:ss')
+               AND 签单日期 <= SYSDATE
              GROUP BY CF.月份
              ORDER BY CF.月份;
     END;
diff --git a/code/web/task_schedule/package-lock.json b/code/web/task_schedule/package-lock.json
index ed19d7e..c0433db 100644
--- a/code/web/task_schedule/package-lock.json
+++ b/code/web/task_schedule/package-lock.json
@@ -8,7 +8,7 @@
             "name": "task_schedule",
             "version": "0.0.0",
             "dependencies": {
-                "@babel/eslint-parser": "^7.22.11",
+                "@babel/eslint-parser": "^7.22.15",
                 "@element-plus/icons-vue": "^2.1.0",
                 "@rushstack/eslint-patch": "^1.3.3",
                 "@vue/eslint-config-typescript": "^11.0.3",
@@ -23,8 +23,8 @@
                 "vuex": "^4.1.0"
             },
             "devDependencies": {
-                "@babel/eslint-parser": "^7.22.11",
-                "@typescript-eslint/eslint-plugin": "^6.5.0",
+                "@babel/eslint-parser": "^7.22.15",
+                "@typescript-eslint/eslint-plugin": "^6.6.0",
                 "@vitejs/plugin-vue": "^4.3.4",
                 "@vue/cli-plugin-eslint": "^5.0.8",
                 "axios": "~1.5.0",
@@ -115,9 +115,9 @@
             }
         },
         "node_modules/@babel/eslint-parser": {
-            "version": "7.22.11",
-            "resolved": "https://registry.npmmirror.com/@babel/eslint-parser/-/eslint-parser-7.22.11.tgz",
-            "integrity": "sha512-YjOYZ3j7TjV8OhLW6NCtyg8G04uStATEUe5eiLuCZaXz2VSDQ3dsAtm2D+TuQyAqNMUK2WacGo0/uma9Pein1w==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmmirror.com/@babel/eslint-parser/-/eslint-parser-7.22.15.tgz",
+            "integrity": "sha512-yc8OOBIQk1EcRrpizuARSQS0TWAcOMpEJ1aafhNznaeYkeL+OhqnDObGFylB8ka8VFF/sZc+S4RzHyO+3LjQxg==",
             "dev": true,
             "dependencies": {
                 "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
@@ -1560,16 +1560,16 @@
             }
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.5.0.tgz",
-            "integrity": "sha512-2pktILyjvMaScU6iK3925uvGU87E+N9rh372uGZgiMYwafaw9SXq86U04XPq3UH6tzRvNgBsub6x2DacHc33lw==",
+            "version": "6.6.0",
+            "resolved": "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.6.0.tgz",
+            "integrity": "sha512-CW9YDGTQnNYMIo5lMeuiIG08p4E0cXrXTbcZ2saT/ETE7dWUrNxlijsQeU04qAAKkILiLzdQz+cGFxCJjaZUmA==",
             "dev": true,
             "dependencies": {
                 "@eslint-community/regexpp": "^4.5.1",
-                "@typescript-eslint/scope-manager": "6.5.0",
-                "@typescript-eslint/type-utils": "6.5.0",
-                "@typescript-eslint/utils": "6.5.0",
-                "@typescript-eslint/visitor-keys": "6.5.0",
+                "@typescript-eslint/scope-manager": "6.6.0",
+                "@typescript-eslint/type-utils": "6.6.0",
+                "@typescript-eslint/utils": "6.6.0",
+                "@typescript-eslint/visitor-keys": "6.6.0",
                 "debug": "^4.3.4",
                 "graphemer": "^1.4.0",
                 "ignore": "^5.2.4",
@@ -1591,34 +1591,34 @@
             }
         },
         "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz",
-            "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==",
+            "version": "6.6.0",
+            "resolved": "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-6.6.0.tgz",
+            "integrity": "sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw==",
             "dev": true,
             "dependencies": {
-                "@typescript-eslint/types": "6.5.0",
-                "@typescript-eslint/visitor-keys": "6.5.0"
+                "@typescript-eslint/types": "6.6.0",
+                "@typescript-eslint/visitor-keys": "6.6.0"
             },
             "engines": {
                 "node": "^16.0.0 || >=18.0.0"
             }
         },
         "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-6.5.0.tgz",
-            "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
+            "version": "6.6.0",
+            "resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-6.6.0.tgz",
+            "integrity": "sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==",
             "dev": true,
             "engines": {
                 "node": "^16.0.0 || >=18.0.0"
             }
         },
         "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
-            "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
+            "version": "6.6.0",
+            "resolved": "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz",
+            "integrity": "sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==",
             "dev": true,
             "dependencies": {
-                "@typescript-eslint/types": "6.5.0",
+                "@typescript-eslint/types": "6.6.0",
                 "eslint-visitor-keys": "^3.4.1"
             },
             "engines": {
@@ -1705,13 +1705,13 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-6.5.0.tgz",
-            "integrity": "sha512-f7OcZOkRivtujIBQ4yrJNIuwyCQO1OjocVqntl9dgSIZAdKqicj3xFDqDOzHDlGCZX990LqhLQXWRnQvsapq8A==",
+            "version": "6.6.0",
+            "resolved": "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-6.6.0.tgz",
+            "integrity": "sha512-8m16fwAcEnQc69IpeDyokNO+D5spo0w1jepWWY2Q6y5ZKNuj5EhVQXjtVAeDDqvW6Yg7dhclbsz6rTtOvcwpHg==",
             "dev": true,
             "dependencies": {
-                "@typescript-eslint/typescript-estree": "6.5.0",
-                "@typescript-eslint/utils": "6.5.0",
+                "@typescript-eslint/typescript-estree": "6.6.0",
+                "@typescript-eslint/utils": "6.6.0",
                 "debug": "^4.3.4",
                 "ts-api-utils": "^1.0.1"
             },
@@ -1728,22 +1728,22 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-6.5.0.tgz",
-            "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
+            "version": "6.6.0",
+            "resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-6.6.0.tgz",
+            "integrity": "sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==",
             "dev": true,
             "engines": {
                 "node": "^16.0.0 || >=18.0.0"
             }
         },
         "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz",
-            "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==",
+            "version": "6.6.0",
+            "resolved": "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.6.0.tgz",
+            "integrity": "sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA==",
             "dev": true,
             "dependencies": {
-                "@typescript-eslint/types": "6.5.0",
-                "@typescript-eslint/visitor-keys": "6.5.0",
+                "@typescript-eslint/types": "6.6.0",
+                "@typescript-eslint/visitor-keys": "6.6.0",
                 "debug": "^4.3.4",
                 "globby": "^11.1.0",
                 "is-glob": "^4.0.3",
@@ -1760,12 +1760,12 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
-            "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
+            "version": "6.6.0",
+            "resolved": "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz",
+            "integrity": "sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==",
             "dev": true,
             "dependencies": {
-                "@typescript-eslint/types": "6.5.0",
+                "@typescript-eslint/types": "6.6.0",
                 "eslint-visitor-keys": "^3.4.1"
             },
             "engines": {
@@ -1880,17 +1880,17 @@
             "dev": true
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-6.5.0.tgz",
-            "integrity": "sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==",
+            "version": "6.6.0",
+            "resolved": "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-6.6.0.tgz",
+            "integrity": "sha512-mPHFoNa2bPIWWglWYdR0QfY9GN0CfvvXX1Sv6DlSTive3jlMTUy+an67//Gysc+0Me9pjitrq0LJp0nGtLgftw==",
             "dev": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.4.0",
                 "@types/json-schema": "^7.0.12",
                 "@types/semver": "^7.5.0",
-                "@typescript-eslint/scope-manager": "6.5.0",
-                "@typescript-eslint/types": "6.5.0",
-                "@typescript-eslint/typescript-estree": "6.5.0",
+                "@typescript-eslint/scope-manager": "6.6.0",
+                "@typescript-eslint/types": "6.6.0",
+                "@typescript-eslint/typescript-estree": "6.6.0",
                 "semver": "^7.5.4"
             },
             "engines": {
@@ -1901,35 +1901,35 @@
             }
         },
         "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz",
-            "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==",
+            "version": "6.6.0",
+            "resolved": "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-6.6.0.tgz",
+            "integrity": "sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw==",
             "dev": true,
             "dependencies": {
-                "@typescript-eslint/types": "6.5.0",
-                "@typescript-eslint/visitor-keys": "6.5.0"
+                "@typescript-eslint/types": "6.6.0",
+                "@typescript-eslint/visitor-keys": "6.6.0"
             },
             "engines": {
                 "node": "^16.0.0 || >=18.0.0"
             }
         },
         "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-6.5.0.tgz",
-            "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
+            "version": "6.6.0",
+            "resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-6.6.0.tgz",
+            "integrity": "sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==",
             "dev": true,
             "engines": {
                 "node": "^16.0.0 || >=18.0.0"
             }
         },
         "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz",
-            "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==",
+            "version": "6.6.0",
+            "resolved": "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.6.0.tgz",
+            "integrity": "sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA==",
             "dev": true,
             "dependencies": {
-                "@typescript-eslint/types": "6.5.0",
-                "@typescript-eslint/visitor-keys": "6.5.0",
+                "@typescript-eslint/types": "6.6.0",
+                "@typescript-eslint/visitor-keys": "6.6.0",
                 "debug": "^4.3.4",
                 "globby": "^11.1.0",
                 "is-glob": "^4.0.3",
@@ -1946,12 +1946,12 @@
             }
         },
         "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
-            "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
+            "version": "6.6.0",
+            "resolved": "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz",
+            "integrity": "sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==",
             "dev": true,
             "dependencies": {
-                "@typescript-eslint/types": "6.5.0",
+                "@typescript-eslint/types": "6.6.0",
                 "eslint-visitor-keys": "^3.4.1"
             },
             "engines": {
diff --git a/code/web/task_schedule/package.json b/code/web/task_schedule/package.json
index e3bf2a3..40b94fa 100644
--- a/code/web/task_schedule/package.json
+++ b/code/web/task_schedule/package.json
@@ -25,7 +25,7 @@
     },
     "devDependencies": {
         "@babel/eslint-parser": "^7.22.15",
-        "@typescript-eslint/eslint-plugin": "^6.5.0",
+        "@typescript-eslint/eslint-plugin": "^6.6.0",
         "@vitejs/plugin-vue": "^4.3.4",
         "@vue/cli-plugin-eslint": "^5.0.8",
         "axios": "~1.5.0",
diff --git a/code/web/task_schedule/src/components/CallerArchievementComponent.vue b/code/web/task_schedule/src/components/CallerArchievementComponent.vue
index 6a822ed..f984833 100644
--- a/code/web/task_schedule/src/components/CallerArchievementComponent.vue
+++ b/code/web/task_schedule/src/components/CallerArchievementComponent.vue
@@ -9,18 +9,16 @@
 -->
 <template>
     <div class="caller-archievment-wrapper">
+        <h1>{{ CallerName }}</h1>
         <table>
             <tr>
-                <td>鍧愬腑鍚嶇О</td><td>{{ CallerName }}</td>
+                <th>褰撴湀淇濊垂</th><td>{{ PresentMonthPremium }}&nbsp;涓囧厓</td>
             </tr>
             <tr>
-                <td>杞﹂櫓淇濊垂</td><td>{{ PresentMonthPremium }}&nbsp;涓囧厓</td>
+                <th>杞﹂潪娓楅�忕巼</th><td>{{ props.attachingRate }}%</td>
             </tr>
             <tr>
-                <td>杞﹂潪娓楅�忕巼</td><td>{{ ui.attachingRate }}%</td>
-            </tr>
-            <tr>
-                <td>缁繚鐜�</td><td>{{ ui.renewalRate }}%</td>
+                <th>缁繚鐜�</th><td>{{ props.renewalRate }}%</td>
             </tr>
         </table>
     </div>
@@ -48,6 +46,16 @@ export default {
             require: true,
             default: (): number => 0,
         },
+        attachingRate: {
+            type: String,
+            require: true,
+            default: (): string => "0.0",
+        },
+        renewalRate: {
+            type: String,
+            require: true,
+            default: (): string => "0.0",
+        },
     },
     setup( props )
     {
@@ -72,6 +80,7 @@ export default {
             CallerName,
             PresentMonthPremium,
             ui,
+            props,
         };
     },
 };
@@ -79,6 +88,79 @@ export default {
 <style scoped lang="scss">
 .caller-archievment-wrapper
 {
-    width: 100%;
+    width: 300px;
+    height: 120px;
+
+    border-radius: 5px;
+
+    margin-bottom: 30px;
+
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: center;
+
+    background-color: #fff;
+    color: #4f4f4f;
+    font-size: 15px;
+
+    h1 {
+        background-color: #fecb96;
+        width: 100%;
+        text-align: center;
+        border-radius: 5px 5px 0px 0px;
+        margin: 0px;
+        padding: 5px 0px;
+
+        color: #da3703;
+
+        font: {
+            size: 1.2rem;
+            weight: 100;
+            family: "FZ-ZHUOHEI";
+        }
+    }
+
+    table {
+        border-collapse: collapse;
+        border-radius: 0px 0px 5px 5px;
+        width: 100%;
+
+        margin-top: 5px;
+
+        background-color: #ffffff;
+
+        font: {
+            size: 14px;
+        }
+
+        th,td {
+            padding: 9px;
+            border-bottom: 1.5px solid #ebeef5;
+        }
+
+        th {
+            width: 5.2rem;
+            text-align: right;
+        }
+
+        th.caller-name {
+            text-align: center;
+            background-color: yellow;
+        }
+
+        td {
+            text-align: left;
+        }
+
+        tr:nth-child(even) {
+            background-color: #f5f6f7;
+        }
+
+        tr:last-child td,th {
+            border-bottom: none;
+        }
+    }
 }
+
 </style>
diff --git a/code/web/task_schedule/src/components/RankingListComponent.vue b/code/web/task_schedule/src/components/RankingListComponent.vue
index 769d2d2..efd7309 100644
--- a/code/web/task_schedule/src/components/RankingListComponent.vue
+++ b/code/web/task_schedule/src/components/RankingListComponent.vue
@@ -103,7 +103,7 @@ export default {
     // border: 1px solid red;
     border-radius: 5px;
     width: 300px;
-    height: 250px;
+    height: 260px;
 }
 
 .rankinglist-index {
diff --git a/code/web/task_schedule/src/views/DesktopArchievement.vue b/code/web/task_schedule/src/views/DesktopArchievement.vue
index b3c7c90..ae56f82 100644
--- a/code/web/task_schedule/src/views/DesktopArchievement.vue
+++ b/code/web/task_schedule/src/views/DesktopArchievement.vue
@@ -48,7 +48,12 @@
             </div>
         </div>
         <div class="right-wrapper">
-            <CallerArchievementComponent :this-month-premium="ui.totalArchievement" />
+            <CallerArchievementComponent
+                :caller-name="callerInfo.telSalerName"
+                :this-month-premium="ui.callerPersentMonthPremium"
+                :attaching-rate="ui.callerAttachingRate"
+                :renewal-rate="ui.callerRenewalRate"
+            />
             <div class="carousel-item">
                 <el-carousel
                     arrow="never"
@@ -123,6 +128,9 @@ interface ui
     showUI: boolean; // 鐢ㄦ潵鍒锋柊椤甸潰鐨勫紑鍏�
     attachingRankingList: RankingListItem[]; // 鍧愬腑杞﹂潪娓楅�忕巼姒滃崟
     renewalRankingList: RankingListItem[];
+    callerAttachingRate: string;
+    callerRenewalRate: string;
+    callerPersentMonthPremium: number;
 }
 
 export default {
@@ -138,7 +146,7 @@ export default {
     setup()
     {
         const monthIndex = new Date();
-        const thisMonth: number = monthIndex.getMonth() + 1; // getMonth杩斿洖鍊间粠0寮�濮嬨��
+        const thisMonth: number = monthIndex.getMonth(); // getMonth杩斿洖鍊间粠0寮�濮嬨��
         const thisMonthString = thisMonth > 10 ? String( thisMonth ) : "0" + String( thisMonth );
         const thisYear: number = monthIndex.getFullYear();
         const thisYearString: string = String( thisYear );
@@ -170,6 +178,9 @@ export default {
             showUI: true, // 鐢ㄦ潵鍒锋柊椤甸潰鐨勫紑鍏�
             attachingRankingList: [], // 鍧愬腑杞﹂潪娓楅�忕巼姒滃崟
             renewalRankingList: [], // 鍧愬腑缁繚鐜囨鍗�
+            callerAttachingRate: "0.0",
+            callerRenewalRate: "0.0",
+            callerPersentMonthPremium: 0,
         });
         let timerHandler = 0;
 
@@ -223,6 +234,10 @@ export default {
             }, 0 );
         };
 
+        /**
+         * 灏嗚姹傜殑鍧愬腑涓氱哗鏁版嵁娓叉煋鍒伴〉闈�
+         * @param data 
+         */
         const applyCallerArchievementData = ( data: CallerArchievement ): void =>
         {
             // 妫�鏌ヨ姹傛槸鍚︽垚鍔�
@@ -239,9 +254,12 @@ export default {
 
             ui.chartData = data.mensual_archievement_list.slice( 0, thisMonth );
             ui.totalArchievement = data.total_archievement;
+            ui.callerAttachingRate = data.attaching_rate;
+            ui.callerRenewalRate = data.insurance_renewal_rate;
+            ui.callerPersentMonthPremium = data.mensual_archievement_list[thisMonth];
 
-            console.log( "涓氱哗娓呭崟", ui.chartData );
-            console.log( "褰撴湀", data.mensual_archievement_list );
+            // console.log( "涓氱哗娓呭崟", ui.chartData );
+            // console.log( "褰撴湀", data.mensual_archievement_list );
 
             ui.showUI = false;
             setTimeout(() =>
@@ -486,11 +504,19 @@ export default {
         width: 300px;
     }
 
-    >div {
+    .carousel-item {
+        // 涓轰簡闄愬埗璧伴┈鐏粍浠剁殑楂樺害
         display: block;
         height: 260px;
         width: 300px;
     }
+
+    // >div {
+    //     // 涓轰簡闄愬埗璧伴┈鐏粍浠剁殑楂樺害
+    //     display: block;
+    //     height: 260px;
+    //     width: 300px;
+    // }
 }
 </style>
 <style lang="scss">
diff --git a/code/鍚庣/desktop_archievement_backend/src/test/java/com/cpic/xim/DesktopArchievement/test/DesktopArchievementTest.java b/code/鍚庣/desktop_archievement_backend/src/test/java/com/cpic/xim/DesktopArchievement/test/DesktopArchievementTest.java
index 9960369..8c9ba25 100644
--- a/code/鍚庣/desktop_archievement_backend/src/test/java/com/cpic/xim/DesktopArchievement/test/DesktopArchievementTest.java
+++ b/code/鍚庣/desktop_archievement_backend/src/test/java/com/cpic/xim/DesktopArchievement/test/DesktopArchievementTest.java
@@ -96,7 +96,7 @@ public class DesktopArchievementTest
             ArrayList<MensualArchievementItem> mensual = null;
             HashMap<String, Object> params = new HashMap<>();
 
-            params.put( "a_caller_code", "5500065875" );
+            params.put( "a_caller_code", "61136" );
 
             mapper.getCallerArchievement( params );