diff --git a/package.json b/package.json index 94d80ba21..e1dd1e3b3 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "vue-router": "^4.0.12", "vue-types": "^4.1.1", "vuedraggable": "4.1.0", - "vxe-table": "^4.1.18", + "vxe-table": "^4.1.21", "wangeditor": "^4.7.9", "xe-utils": "^3.5.2", "xgplayer": "2.28.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3eca284e4..42403c2a3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -90,7 +90,7 @@ specifiers: vue-router: ^4.0.12 vue-types: ^4.1.1 vuedraggable: 4.1.0 - vxe-table: ^4.1.18 + vxe-table: ^4.1.21 wangeditor: ^4.7.9 windicss: ^3.4.3 xe-utils: ^3.5.2 diff --git a/src/components/ReMap/src/Amap.vue b/src/components/ReMap/src/Amap.vue index f696f9796..feb3e5111 100644 --- a/src/components/ReMap/src/Amap.vue +++ b/src/components/ReMap/src/Amap.vue @@ -19,10 +19,6 @@ type resultType = { info: Array; }; -export interface mapInter { - loading: boolean; -} - let MarkerCluster; let map: MapConfigureInter; diff --git a/src/style/element-plus.scss b/src/style/element-plus.scss index b871e9065..bd1547b03 100644 --- a/src/style/element-plus.scss +++ b/src/style/element-plus.scss @@ -46,7 +46,7 @@ --el-button-active-border-color: var(--el-color-primary-active) !important; } -// button--primary plain +/* button--primary plain */ .el-button--primary.is-plain { --el-button-bg-color: var(--el-color-primary-light-9) !important; --el-button-border-color: var(--el-color-primary-light-6) !important; diff --git a/src/utils/http/index.ts b/src/utils/http/index.ts index 2c99fa56a..625ca6124 100644 --- a/src/utils/http/index.ts +++ b/src/utils/http/index.ts @@ -145,21 +145,21 @@ class PureHttp { } // 单独抽离的post工具函数 - public post( + public post( url: string, params?: T, config?: PureHttpRequestConfig - ): Promise { - return this.request("post", url, params, config); + ): Promise

{ + return this.request

("post", url, params, config); } // 单独抽离的get工具函数 - public get( + public get( url: string, params?: T, config?: PureHttpRequestConfig - ): Promise { - return this.request("get", url, params, config); + ): Promise

{ + return this.request

("get", url, params, config); } }