From 7ba9d249eee00ce77c219195f5a82ccd048ad06c Mon Sep 17 00:00:00 2001 From: Kane Wang Date: Thu, 11 Jan 2024 18:46:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/db/pkg/telsale_archievement_pkg.pck | 2 +- code/db/pkg/telsale_bi_utils.pck | 8 +- code/web/task_schedule/package-lock.json | 124 +++++++++--------- code/web/task_schedule/package.json | 6 +- .../src/layout/components/Aside.vue | 16 +-- .../src/layout/components/Header.vue | 2 +- .../xim/utils/data/ImportBIExcelData.java | 2 + .../dataimport/bi/ImportBIDataController.java | 2 + .../mapper/ImportBIArchievementDataMapper.xml | 8 +- .../mapper/QueryBIArchievementDataMapper.xml | 4 +- 10 files changed, 83 insertions(+), 91 deletions(-) diff --git a/code/db/pkg/telsale_archievement_pkg.pck b/code/db/pkg/telsale_archievement_pkg.pck index a585372..a387d71 100644 --- a/code/db/pkg/telsale_archievement_pkg.pck +++ b/code/db/pkg/telsale_archievement_pkg.pck @@ -299,7 +299,7 @@ CREATE OR REPLACE PACKAGE BODY TELSALE_ARCHIEVEMENT_PKG IS FROM (SELECT T.责任人, ROUND(t."个车续保率（全月）(%)", 2) XBL - FROM BI电销坐席续保率跟踪表 T + FROM "BI电销坐席续保率跟踪表-24年" T WHERE T.责任部门 = L_DEPARTMENT_NAME ORDER BY XBL DESC) PAIHANG; END; diff --git a/code/db/pkg/telsale_bi_utils.pck b/code/db/pkg/telsale_bi_utils.pck index 8e2a9fc..636d68e 100644 --- a/code/db/pkg/telsale_bi_utils.pck +++ b/code/db/pkg/telsale_bi_utils.pck @@ -23,8 +23,8 @@ CREATE OR REPLACE PACKAGE BODY TELSALE_BI_UTILS IS PROCEDURE 清理BI电销坐席续保率跟踪表 IS BEGIN - EXECUTE IMMEDIATE 'truncate table BI电销坐席续保率跟踪表'; - --EXECUTE IMMEDIATE 'truncate table BI电销坐席续保率跟踪表-24年'; + --EXECUTE IMMEDIATE 'truncate table BI电销坐席续保率跟踪表'; + EXECUTE IMMEDIATE 'truncate table "BI电销坐席续保率跟踪表-24年"'; END; PROCEDURE 清理BI部门渗透率跟踪表 IS @@ -34,8 +34,8 @@ CREATE OR REPLACE PACKAGE BODY TELSALE_BI_UTILS IS PROCEDURE 清理BI部门续保率跟踪表 IS BEGIN - EXECUTE IMMEDIATE 'truncate table BI机构当月个车续保率跟踪表'; - --EXECUTE IMMEDIATE 'truncate table BI机构续保率跟踪表-24年'; + --EXECUTE IMMEDIATE 'truncate table BI机构当月个车续保率跟踪表'; + EXECUTE IMMEDIATE 'truncate table "BI机构续保率跟踪表-24年"'; END; BEGIN diff --git a/code/web/task_schedule/package-lock.json b/code/web/task_schedule/package-lock.json index 913db80..02264ba 100644 --- a/code/web/task_schedule/package-lock.json +++ b/code/web/task_schedule/package-lock.json @@ -10,11 +10,11 @@ "dependencies": { "@element-plus/icons-vue": "^2.3.1", "echarts": "^5.4.3", - "element-plus": "^2.4.4", + "element-plus": "^2.5.1", "mitt": "^3.0.1", "moment": "^2.30.1", "sass-loader": "^13.3.3", - "vue": "^3.4.7", + "vue": "^3.4.8", "vue-router": "^4.2.5", "vuex": "^4.1.0" }, @@ -29,7 +29,7 @@ "babel": "^6.23.0", "eslint-config-recommended": "^4.1.0", "eslint-config-standard-with-typescript": "^43.0.0", - "eslint-plugin-vue": "^9.19.2", + "eslint-plugin-vue": "^9.20.0", "node-sass": "^9.0.0", "sass": "^1.69.7", "style-loader": "^3.3.4", @@ -2561,12 +2561,12 @@ "dev": true }, "node_modules/@vue/compiler-core": { - "version": "3.4.7", - "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.7.tgz", - "integrity": "sha512-hhCaE3pTMrlIJK7M/o3Xf7HV8+JoNTGOQ/coWS+V+pH6QFFyqtoXqQzpqsNp7UK17xYKua/MBiKj4e1vgZOBYw==", + "version": "3.4.8", + "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.8.tgz", + "integrity": "sha512-GjAwOydZV6UyVBi1lYW5v4jjfU6wOeyi3vBATKJOwV7muYF0/nZi4kfdJc0pwdT5lXwbbx57lyA2Y356rFpw1A==", "dependencies": { "@babel/parser": "^7.23.6", - "@vue/shared": "3.4.7", + "@vue/shared": "3.4.8", "entities": "^4.5.0", "estree-walker": "^2.0.2", "source-map-js": "^1.0.2" @@ -2581,24 +2581,24 @@ } }, "node_modules/@vue/compiler-dom": { - "version": "3.4.7", - "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.7.tgz", - "integrity": "sha512-qDKBAIurCTub4n/6jDYkXwgsFuriqqmmLrIq1N2QDfYJA/mwiwvxi09OGn28g+uDdERX9NaKDLji0oTjE3sScg==", + "version": "3.4.8", + "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.8.tgz", + "integrity": "sha512-GsPyji42zmkSJlaDFKXvwB97ukTlHzlFH/iVzPFYz/APnSzuhu/CMFQbsYmrtsnc2yscF39eC4rKzvKR27aBug==", "dependencies": { - "@vue/compiler-core": "3.4.7", - "@vue/shared": "3.4.7" + "@vue/compiler-core": "3.4.8", + "@vue/shared": "3.4.8" } }, "node_modules/@vue/compiler-sfc": { - "version": "3.4.7", - "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.4.7.tgz", - "integrity": "sha512-Gec6CLkReVswDYjQFq79O5rktri4R7TsD/VPCiUoJw40JhNNxaNJJa8mrQrWoJluW4ETy6QN0NUyC/JO77OCOw==", + "version": "3.4.8", + "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.4.8.tgz", + "integrity": "sha512-3ZcurOa6bQdZ6VZLtMqYSUZqpsMqfX0MC3oCxQG0VIJFCqouZAgRYJN1c8QvGs7HW5wW8aXVvUOQU0ILVlYHKA==", "dependencies": { "@babel/parser": "^7.23.6", - "@vue/compiler-core": "3.4.7", - "@vue/compiler-dom": "3.4.7", - "@vue/compiler-ssr": "3.4.7", - "@vue/shared": "3.4.7", + "@vue/compiler-core": "3.4.8", + "@vue/compiler-dom": "3.4.8", + "@vue/compiler-ssr": "3.4.8", + "@vue/shared": "3.4.8", "estree-walker": "^2.0.2", "magic-string": "^0.30.5", "postcss": "^8.4.32", @@ -2606,12 +2606,12 @@ } }, "node_modules/@vue/compiler-ssr": { - "version": "3.4.7", - "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.7.tgz", - "integrity": "sha512-PvYeSOvnCkST5mGS0TLwEn5w+4GavtEn6adcq8AspbHaIr+mId5hp7cG3ASy3iy8b+LuXEG2/QaV/nj5BQ/Aww==", + "version": "3.4.8", + "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.8.tgz", + "integrity": "sha512-nxN79LHeAemhBpIa2PQ6rz57cW7W4C/XIJCOMSn2g49u6q2ekirmJI0osAOTErQPApOR0KwP2QyeTexX4zQCrw==", "dependencies": { - "@vue/compiler-dom": "3.4.7", - "@vue/shared": "3.4.7" + "@vue/compiler-dom": "3.4.8", + "@vue/shared": "3.4.8" } }, "node_modules/@vue/component-compiler-utils": { @@ -2710,48 +2710,48 @@ } }, "node_modules/@vue/reactivity": { - "version": "3.4.7", - "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.4.7.tgz", - "integrity": "sha512-F539DO0ogH0+L8F9Pnw7cjqibcmSOh5UTk16u5f4MKQ8fraqepI9zdh+sozPX6VmEHOcjo8qw3Or9ZcFFw4SZA==", + "version": "3.4.8", + "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.4.8.tgz", + "integrity": "sha512-UJYMQ3S2rqIGw9IvKomD4Xw2uS5VlcKEEmwcfboGOdrI79oqebxnCgTvXWLMClvg3M5SF0Cyn+9eDQoyGMLu9Q==", "dependencies": { - "@vue/shared": "3.4.7" + "@vue/shared": "3.4.8" } }, "node_modules/@vue/runtime-core": { - "version": "3.4.7", - "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.4.7.tgz", - "integrity": "sha512-QMMsWRQaD3BpGyjjChthpl4Mji4Fjx1qfdufsXlDkKU3HV+hWNor2z+29F+E1MmVcP0ZfRZUfqYgtsQoL7IGwQ==", + "version": "3.4.8", + "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.4.8.tgz", + "integrity": "sha512-sMRXOy89KnwY6fWG5epgPOsCWzpo/64FrA0QkjIeNeGnoA2YyZ6bBUxpFUyqhJ8VbrDhXEFH+6LHMOYrpzX/ZQ==", "dependencies": { - "@vue/reactivity": "3.4.7", - "@vue/shared": "3.4.7" + "@vue/reactivity": "3.4.8", + "@vue/shared": "3.4.8" } }, "node_modules/@vue/runtime-dom": { - "version": "3.4.7", - "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.4.7.tgz", - "integrity": "sha512-XwegyUY1rw8zxsX1Z36vwYcqo+uOgih5ti7y9vx+pPFhNdSQmN4LqK2RmSeAJG1oKV8NqSUmjpv92f/x6h0SeQ==", + "version": "3.4.8", + "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.4.8.tgz", + "integrity": "sha512-L4gZcYo8f3d7rQqQIHkPvyczkjjQ55cJqz2G0v6Ptmqa1mO2zkqN9F8lBT6aGPYy3hd0RDiINbs4jxhSvvy10Q==", "dependencies": { - "@vue/runtime-core": "3.4.7", - "@vue/shared": "3.4.7", + "@vue/runtime-core": "3.4.8", + "@vue/shared": "3.4.8", "csstype": "^3.1.3" } }, "node_modules/@vue/server-renderer": { - "version": "3.4.7", - "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.4.7.tgz", - "integrity": "sha512-3bWnYLEkLLhkDWqvNk7IvbQD4UcxvFKxELBiOO2iG3m6AniFIsBWfHOO5tLVQnjdWkODu4rq0GipmfEenVAK5Q==", + "version": "3.4.8", + "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.4.8.tgz", + "integrity": "sha512-pBeHM59Owevr3P0Fl1XOjBmq4DTy5JDcjMG4NuzJEVDlZYzY8fHybx0wdjkY5lK5mCtUyBtw6Mz4d87aosc1Sw==", "dependencies": { - "@vue/compiler-ssr": "3.4.7", - "@vue/shared": "3.4.7" + "@vue/compiler-ssr": "3.4.8", + "@vue/shared": "3.4.8" }, "peerDependencies": { - "vue": "3.4.7" + "vue": "3.4.8" } }, "node_modules/@vue/shared": { - "version": "3.4.7", - "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.7.tgz", - "integrity": "sha512-G+i4glX1dMJk88sbJEcQEGWRQnVm9eIY7CcQbO5dpdsD9SF8jka3Mr5OqZYGjczGN1+D6EUwdu6phcmcx9iuPA==" + "version": "3.4.8", + "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.8.tgz", + "integrity": "sha512-ChLCWzXiJboQ009oVkemhEoUdrxHme7v3ip+Kh+/kDDeF1WtHWGt0knRLGm1Y4YqCRTSs9QxsZIY8paJj5Szrw==" }, "node_modules/@vue/vue-loader-v15": { "name": "vue-loader", @@ -5201,9 +5201,9 @@ "integrity": "sha512-UdREXMXzLkREF4jA8t89FQjA8WHI6ssP38PMY4/4KhXFQbtImnghh4GkCgrtiZwLKUKVD2iTVXvDVQjfomEQuA==" }, "node_modules/element-plus": { - "version": "2.4.4", - "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.4.4.tgz", - "integrity": "sha512-TlKubXJgxwhER0dw+8ULn9hr9kZjraV4R6Q/eidwWUwCKxwXYPBGmMKsZ/85tlxlhMYbcLZd/YZh6G3QkHX4fg==", + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.5.1.tgz", + "integrity": "sha512-ylX9h2U125/nesPlLWgfPkI1rID9EiGROlgf0QkzBUjx+/d4w/YqS+IqZZZC5yvQPhKYu9aMDqEBzOurwn4Cnw==", "dependencies": { "@ctrl/tinycolor": "^3.4.1", "@element-plus/icons-vue": "^2.3.1", @@ -7300,9 +7300,9 @@ } }, "node_modules/eslint-plugin-vue": { - "version": "9.19.2", - "resolved": "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-9.19.2.tgz", - "integrity": "sha512-CPDqTOG2K4Ni2o4J5wixkLVNwgctKXFu6oBpVJlpNq7f38lh9I80pRTouZSJ2MAebPJlINU/KTFSXyQfBUlymA==", + "version": "9.20.0", + "resolved": "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-9.20.0.tgz", + "integrity": "sha512-9/DV5CM7ItfgWmXjL6j3zyDtVTrslYdnEm+rnYNajdElx17b3erxi/Wc6FY7t3BQ6dgo0t/UBpgiWCOKtJyN8Q==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", @@ -7310,7 +7310,7 @@ "nth-check": "^2.1.1", "postcss-selector-parser": "^6.0.13", "semver": "^7.5.4", - "vue-eslint-parser": "^9.3.1", + "vue-eslint-parser": "^9.4.0", "xml-name-validator": "^4.0.0" }, "engines": { @@ -14665,15 +14665,15 @@ } }, "node_modules/vue": { - "version": "3.4.7", - "resolved": "https://registry.npmmirror.com/vue/-/vue-3.4.7.tgz", - "integrity": "sha512-4urmkWpudekq0CPNMO7p6mBGa9qmTXwJMO2r6CT4EzIJVG7WoSReiysiNb7OSi/WI113oX0Srn9Rz1k/DCXKFQ==", + "version": "3.4.8", + "resolved": "https://registry.npmmirror.com/vue/-/vue-3.4.8.tgz", + "integrity": "sha512-vJffFOe6DqWsAI10v3tDhb1nJrj7CF3CbdQwOznywAsFNoyvrQ1AWQdcIWJpmRpRnw7NFzstzh6fh4w7n1PNdg==", "dependencies": { - "@vue/compiler-dom": "3.4.7", - "@vue/compiler-sfc": "3.4.7", - "@vue/runtime-dom": "3.4.7", - "@vue/server-renderer": "3.4.7", - "@vue/shared": "3.4.7" + "@vue/compiler-dom": "3.4.8", + "@vue/compiler-sfc": "3.4.8", + "@vue/runtime-dom": "3.4.8", + "@vue/server-renderer": "3.4.8", + "@vue/shared": "3.4.8" }, "peerDependencies": { "typescript": "*" diff --git a/code/web/task_schedule/package.json b/code/web/task_schedule/package.json index d3d7782..3247e75 100644 --- a/code/web/task_schedule/package.json +++ b/code/web/task_schedule/package.json @@ -11,11 +11,11 @@ "dependencies": { "@element-plus/icons-vue": "^2.3.1", "echarts": "^5.4.3", - "element-plus": "^2.4.4", + "element-plus": "^2.5.1", "mitt": "^3.0.1", "moment": "^2.30.1", "sass-loader": "^13.3.3", - "vue": "^3.4.7", + "vue": "^3.4.8", "vue-router": "^4.2.5", "vuex": "^4.1.0" }, @@ -30,7 +30,7 @@ "babel": "^6.23.0", "eslint-config-recommended": "^4.1.0", "eslint-config-standard-with-typescript": "^43.0.0", - "eslint-plugin-vue": "^9.19.2", + "eslint-plugin-vue": "^9.20.0", "node-sass": "^9.0.0", "sass": "^1.69.7", "style-loader": "^3.3.4", diff --git a/code/web/task_schedule/src/layout/components/Aside.vue b/code/web/task_schedule/src/layout/components/Aside.vue index 8924f9e..834d713 100644 --- a/code/web/task_schedule/src/layout/components/Aside.vue +++ b/code/web/task_schedule/src/layout/components/Aside.vue @@ -78,32 +78,22 @@ // @ts-expect-error 涔嬪悗鍐嶈ˉ鍏呯被鍨嬫枃浠 import { hasOnlyChild } from "@/router/index.js"; import { useRoute, useRouter } from "vue-router"; -// import { useRoute, useRouter, type RouteRecordNormalized, type _RouteRecordBase } from "vue-router"; import { computed } from "vue"; -// declare interface SideBarRouteRecordNormalized extends RouteRecordNormalized -// { -// hidden?: boolean; -// } - -// declare interface SideBarRouteRecordSingleView extends _RouteRecordBase -// { - -// } - export default { name: "LayoutAside", setup() { + const userRout = useRoute(); const router = useRouter(); const routes = router.getRoutes();// as SideBarRouteRecordNormalized[]; const currentPath = computed(() => { - return useRoute().path; + return userRout.path; }); - return { routes, currentPath, hasOnlyChild, }; + return { userRout, routes, currentPath, hasOnlyChild, }; }, }; diff --git a/code/web/task_schedule/src/layout/components/Header.vue b/code/web/task_schedule/src/layout/components/Header.vue index f79afd2..38a22fe 100644 --- a/code/web/task_schedule/src/layout/components/Header.vue +++ b/code/web/task_schedule/src/layout/components/Header.vue @@ -12,7 +12,7 @@ CPIC
妗岄潰闇稿睆鍚庡彴绠＄悊 - Build-20231220 + Build-20240111
\ No newline at end of file diff --git a/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/QueryBIArchievementDataMapper.xml b/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/QueryBIArchievementDataMapper.xml index 5901d58..b28207d 100644 --- a/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/QueryBIArchievementDataMapper.xml +++ b/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/QueryBIArchievementDataMapper.xml @@ -102,9 +102,7 @@ t."涓溅缁繚鐜囷紙搴忔椂锛(%)" as 涓溅缁繚鐜囧簭鏃, t."涓溅缁繚鐜囷紙鍏ㄦ湀锛(%)" as 涓溅缁繚鐜囧叏鏈, t."鐜瘮鏄ㄦ棩(%)" as 鐜瘮鏄ㄦ棩, - t."鐜瘮涓婃湀(%)" as 鐜瘮涓婃湀, - t.骞冲潎鎻愬墠绛惧崟澶╂暟, - t.鐜瘮 + t."鐜瘮涓婃湀(%)" as 鐜瘮涓婃湀 from "BI鏈烘瀯缁繚鐜囪窡韪〃-24骞" t