Procházet zdrojové kódy

refactor(pressure2): 重构压力容器相关常量和工具函数

xy před 13 hodinami
rodič
revize
484f2b5483

+ 0 - 21
yudao-ui-admin-vue3/src/api/laboratory/standard/template.ts

@@ -187,24 +187,3 @@ export const downloadTemplateApi = (params) => {
 export const exportExportExcelApi = (params) => {
   return request.download({url: '/system/standard-template/export-excel', params})
 }
-
-export const createStandardTemplateV2 = (data: TemplateType) => {
-  return request.post({
-    url: '/system/standard-template/create',
-    headers: {
-      'Content-Type': 'multipart/form-data'
-    },
-    data
-  })
-}
-
-export const getStandardTemplateInfoV2 = (params: {id: string}) => {
-  return request.get({
-    url: '/system/standard-template/v2/get',
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded',
-      'Response-Type': "blob"
-    },
-    params
-  })
-}

+ 29 - 0
yudao-ui-admin-vue3/src/api/pressure2/comm/constants.ts

@@ -0,0 +1,29 @@
+//锅炉检验类型
+import {PressureCheckTypeMap} from "@/utils/constants";
+
+export const PressureBoilerCheckType = {
+  IN: 100,
+  OUT: 200,
+  PRESSURE: 300
+}
+export const PressureBoilerCheckTypeMap = {
+  [PressureBoilerCheckType.IN]: '内部检验',
+  [PressureBoilerCheckType.OUT]: '外部检验',
+  [PressureBoilerCheckType.PRESSURE]: '耐压检验'
+}
+
+// 管道检验类型
+export const PressurePipeCheckType = {
+  REGULAR: 100,
+  ANNUAL: 200
+}
+export const PressurePipeCheckTypeMap = {
+  [PressurePipeCheckType.REGULAR]: '定期检验',
+  [PressurePipeCheckType.ANNUAL]: '年度检查',
+}
+
+export const allCheckTypeMap = {
+  100:PressureCheckTypeMap,
+  200:PressureBoilerCheckTypeMap,
+  300:PressurePipeCheckTypeMap,
+}

+ 10 - 0
yudao-ui-admin-vue3/src/api/pressure2/comm/formatTime.ts

@@ -0,0 +1,10 @@
+import dayjs from 'dayjs'
+
+export function formatDate1(date: Date, format?: string): string {
+  // 日期不存在,则返回空
+  if (!date) {
+    return ''
+  }
+  // 日期存在,则进行格式化
+  return date ? dayjs(date).format(format ?? 'YYYY-MM-DD') : ''
+}

+ 34 - 0
yudao-ui-admin-vue3/src/api/pressure2/comm/template.ts

@@ -0,0 +1,34 @@
+import request from '@/config/axios'
+
+interface TemplateType {
+  name: string
+  type: string
+  classId: string
+  signType: string
+  sort: number
+  status: number
+  versionNumber: string
+  bindingPathSchema: string
+  file: File
+}
+
+export const createStandardTemplateV2 = (data: TemplateType) => {
+  return request.post({
+    url: '/system/standard-template/create',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
+    data
+  })
+}
+
+export const getStandardTemplateInfoV2 = (params: {id: string}) => {
+  return request.get({
+    url: '/system/standard-template/v2/get',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+      'Response-Type': "blob"
+    },
+    params
+  })
+}

+ 4 - 2
yudao-ui-admin-vue3/src/components/DynamicReport/SpreadEditor.vue

@@ -78,10 +78,12 @@ import * as GC from '@grapecity-software/spread-sheets'
 import SpreadDesigner from '@/components/SpreadDesigner/index.vue'
 import {useTagsViewStore} from '@/store/modules/tagsView'
 import {
-  createStandardTemplateV2,
-  getStandardTemplateInfoV2,
   updateStandardTemplate
 } from '@/api/laboratory/standard/template'
+import{
+  createStandardTemplateV2,
+  getStandardTemplateInfoV2,
+} from '@/api/pressure2/comm/template'
 import {useRoute, useRouter} from 'vue-router'
 import {buildFileUrl} from '@/utils'
 import {DynamicTbApi} from '@/api/pressure2/dynamictb'

+ 0 - 8
yudao-ui-admin-vue3/src/utils/formatTime.ts

@@ -344,11 +344,3 @@ export function formatArrayDate(dateArr: number[] | null): string {
   return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`
 }
 
-export function formatDate1(date: Date, format?: string): string {
-  // 日期不存在,则返回空
-  if (!date) {
-    return ''
-  }
-  // 日期存在,则进行格式化
-  return date ? dayjs(date).format(format ?? 'YYYY-MM-DD') : ''
-}

+ 1 - 1
yudao-ui-admin-vue3/src/views/pressure2/dynamictb/SpreadDesigner/index.vue

@@ -3,7 +3,7 @@ import { unref, ref,nextTick } from 'vue'
 import { FullScreen } from '@element-plus/icons-vue'
 // import * as GC from '@grapecity-software/spread-sheets'
 import GC from '@/components/SpreadDesigner/tools/gc'
-import '@grapecity/spread-sheets-resources-zh'
+// import '@grapecity/spread-sheets-resources-zh'
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'

+ 2 - 1
yudao-ui-admin-vue3/src/views/pressure2/planNew/components/PlanScheduleEquipBoilerDialog.vue

@@ -348,7 +348,8 @@ import {ElMessageBox, FormInstance} from 'element-plus'
 import { useMessage } from '@/hooks/web/useMessage'
 import CheckerSelect from '@/views/pressure2/equipboilerscheduling/components/CheckerSelect.vue'
 import { PlanSchedulingEquipVO, PlanSchedulingApi } from '@/api/pressure/planScheduling'
-import {formatArrayDate, formatDate, formatDate1} from '@/utils/formatTime'
+import {formatArrayDate, formatDate} from '@/utils/formatTime'
+import {formatDate1} from '@/api/pressure2/comm/formatTime'
 import {
   PressureBoilerCheckType,
   PressureBoilerCheckTypeMap,

+ 2 - 1
yudao-ui-admin-vue3/src/views/pressure2/planNew/components/PlanScheduleEquipPipeDialog.vue

@@ -300,7 +300,8 @@
 import type { PropType } from 'vue'
 import { FormInstance } from 'element-plus'
 import { useMessage } from '@/hooks/web/useMessage'
-import {formatArrayDate, formatDate, formatDate1} from '@/utils/formatTime'
+import {formatArrayDate, formatDate} from '@/utils/formatTime'
+import {formatDate1} from '@/api/pressure2/comm/formatTime'
 import {
   PressurePipeCheckType,
   PressurePipeCheckTypeMap,