Merge branch 'develop_Allen' of http://47.108.150.237:10000/www/taais-web into develop_Allen

# Conflicts:
#	src/views/task/bizProcess/index.vue

.env.development

@@ -25,7 +25,8 @@ VITE_APP_RSA_PRIVATE_KEY = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3C
 VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'
 
 # 开发环境跨域代理，支持配置多个
-VITE_PROXY = [["/api","http://localhost:9090"]]
+# VITE_PROXY = [["/api","http://localhost:9090"]]
+VITE_PROXY = [["/api","http://192.168.101.34/prod-api"]]
 # VITE_PROXY = [["/api","https://mock.mengxuegu.com/mock/629d727e6163854a32e8307e"]]
 # VITE_PROXY = [["/api","https://www.fastmock.site/mock/f81e8333c1a9276214bcdbc170d9e0a0"]]
 # VITE_PROXY = [["/api-easymock","https://mock.mengxuegu.com"],["/api-fastmock","https://www.fastmock.site"]]

src/api/interface/index.ts

@@ -51,7 +51,7 @@ export namespace Login {
     uuid: string
     clientId: string
     grantType: string
-    tenantId: string
+    tenantId: string | number
   }
   export interface ResLogin {
     access_token: string

src/api/interface/login.ts

@@ -15,7 +15,7 @@ export type RegisterForm = {
  * 登录请求
  */
 export interface LoginData {
-  tenantId?: number
+  tenantId?: number | string
   username?: string
   password?: string
   rememberMe?: boolean

src/api/modules/demo/data.ts

@@ -1,12 +1,11 @@
 import http from '@/api'
-import { DataVO, DataForm, DataQuery } from '@/api/interface/demo/data'
 /**
  * @name 查询数据管理列表
  * @param query 参数
  * @returns 返回列表
  */
-export const listDataApi = (query: DataQuery) => {
-  return http.get<DataVO[]>('/demo/data/list', query, { loading: true })
+export const listDataApi = (query: any) => {
+  return http.get<any[]>('/demo/data/list', query, { loading: true })
 }
 
 /**
@@ -15,7 +14,7 @@ export const listDataApi = (query: DataQuery) => {
  * @returns returns
  */
 export const getDataApi = (id: string | number) => {
-  return http.get<DataVO>(`/demo/data/${id}`)
+  return http.get<any>(`/demo/data/${id}`)
 }
 
 /**
@@ -23,7 +22,7 @@ export const getDataApi = (id: string | number) => {
  * @param data data
  * @returns returns
  */
-export const addDataApi = (data: DataForm) => {
+export const addDataApi = (data: any) => {
   return http.post<any>('/demo/data', data, { loading: false })
 }
 
@@ -32,7 +31,7 @@ export const addDataApi = (data: DataForm) => {
  * @param data data
  * @returns returns
  */
-export const updateDataApi = (data: DataForm) => {
+export const updateDataApi = (data: any) => {
   return http.put<any>('/demo/data', data, { loading: false })
 }
 

src/stores/modules/auth.ts

@@ -29,7 +29,7 @@ export const useAuthStore = defineStore('admin-auth', {
     // Get AuthMenuList
     async getAuthMenuList() {
       const { data } = await getRoutersApi()
-      this.authMenuList = [...staticRouterList.data, ...data]
+      this.authMenuList = [...staticRouterList.data, ...data] as any[]
     },
     // Set RouteName
     async setRouteName(name: string) {

src/typings/ProForm.d.ts

@@ -38,6 +38,7 @@ declare namespace ProForm {
     | 'transfer' // label不显示 使用插槽吧
     | 'icon' // 图标
     | 'tree'
+    | File.FileUploadType
   interface FormOptions {
     inline?: boolean
     labelWidth?: string | number

src/views/task/bizProcess/index.vue

@@ -230,7 +230,7 @@ const contrastResults = () => {
           resultsFlag.value = true
           testResultsData.value = res.data as any
           const num = testResultsData.value['agNameList'].length
-          spanNum.value = 24 / num <= 4 ? 4 : parseInt(24 / num)
+          spanNum.value = 24 / num <= 4 ? 4 : Math.floor(24 / num)
           resultVisible.value = true
         })
         break
@@ -245,7 +245,7 @@ const handleResultData = data => {
   resultsData.value = data
   resultsData.value['agNameList'].unshift('')
   const num = resultsData.value['agNameList'].length + 1
-  spanNum.value = 24 / num <= 4 ? 4 : parseInt(24 / num)
+  spanNum.value = 24 / num <= 4 ? 4 : Math.floor(24 / num)
   resultsData.value['rcureList'].unshift('R_curve')
   resultsData.value['pcureList'].unshift('P_curve')
   resultsData.value['f1cureList'].unshift('F1_curve')