Merge branch 'main' of https://git.jsspisoft.com/ry-das

ui/dasadmin/src/api/backend/index.ts

@@ -46,6 +46,7 @@ export function menusQuery(params: object = {}) {
         url: '/api/menus/query',
         method: 'POST',
         data: params,
+        timeout: 80 * 1000,
     })
 }
 
@@ -166,7 +167,6 @@ export function equipTree(params: object = {}) {
     })
 }
 
-
 // 设备分页查询
 export function equipQuery(params: object = {}) {
     return createAxios({
@@ -211,7 +211,7 @@ export function equipUpdate(params: object = {}) {
 //     })
 // }
 
-export const equipImport = (data:FormData, v:string) => {
+export const equipImport = (data: FormData, v: string) => {
     const token = encrypt_aes(adminInfo.token, v)
     return createAxios(
         {
@@ -247,7 +247,6 @@ export function equipType(params: object = {}) {
     })
 }
 
-
 // 设备详情物模型
 export function equipDetailsModel(params: object = {}) {
     return createAxios({
@@ -258,7 +257,7 @@ export function equipDetailsModel(params: object = {}) {
 }
 
 // 设备详情机构
-export function equipDetailsOrg(params: object = {} ) {
+export function equipDetailsOrg(params: object = {}) {
     return createAxios({
         url: '/api/org/list',
         method: 'POST',

ui/dasadmin/src/utils/axios.ts

@@ -42,10 +42,9 @@ export const getUrlPort = (): string => {
 function createAxios<Data = any, T = ApiPromise<Data>>(axiosConfig: AxiosRequestConfig, options: Options = {}, loading: LoadingOptions = {}): T {
     const config = useConfig()
     const adminInfo = useAdminInfo()
-
     const Axios = axios.create({
         baseURL: getUrl(),
-        timeout: 1000 * 10,
+        timeout: axiosConfig.timeout ? axiosConfig.timeout : 1000 * 10,
         headers: {
             'think-lang': config.lang.defaultLang,
             server: true,

ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue

@@ -75,11 +75,9 @@ const statAnalysisInterval = ref('1h')
 const statAnalysisDeviceId = ref('')
 const statAnalysisSelectOptions: any = reactive({
     interval: [
-        { label: '一分钟', value: '1m' },
         { label: '一分钟', value: '1m' },
         { label: '五分钟', value: '5m' },
         { label: '十分钟', value: '10m' },
-        { label: '十分钟', value: '10m' },
         { label: '十五分钟', value: '15m' },
         { label: '一小时', value: '1h' },
         { label: '一天', value: '1d' },

ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue

@@ -575,8 +575,8 @@ const getTimestamps = (start: any, end: any, interval: any) => {
             case '5m':
                 current += 5 * 60 * 1000
                 break
-            case '15m':
-                current += 15 * 60 * 1000
+            case '10m':
+                current += 10 * 60 * 1000
                 break
             case '1d':
                 current += 24 * 60 * 60 * 1000