diff --git a/.env.prod b/.env.prod index 1b97e10..c20df8d 100644 --- a/.env.prod +++ b/.env.prod @@ -4,10 +4,10 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://dev.ccwin-in.com:25300/api' +VITE_BASE_URL='http://10.56.17.106:25111' # 上传路径 -VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://10.56.17.106:25111/api/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH= @@ -28,13 +28,13 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0-ui +VITE_OUT_DIR=sfms3.0-ui-prod # 自定义接口路径 -VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' +VITE_INTERFACE_URL='http://10.56.17.106:25111/magic/web/index.html' # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310' +VITE_JMREPORT_BASE_URL='http://10.56.17.106:25111' # 租户配置 VITE_TENANT='["东驰新能源"]' diff --git a/.env.test b/.env.test index cb687a7..2fabcf5 100644 --- a/.env.test +++ b/.env.test @@ -4,10 +4,11 @@ NODE_ENV=test VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://dev.ccwin-in.com:29000/api' - +VITE_BASE_URL='http://10.56.17.106:25111' +#VITE_BASE_URL='http://dev.ccwin-in.com:25111' # 上传路径 -VITE_UPLOAD_URL='http://dev.ccwin-in.com:29000/api/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://10.56.17.106:25111/api/admin-api/infra/file/upload' +#VITE_UPLOAD_URL='http://dev.ccwin-in.com:25111/api/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH= @@ -28,16 +29,17 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0-ui +VITE_OUT_DIR=sfms3.0-ui-test # 自定义接口路径 -VITE_INTERFACE_URL='http://dev.ccwin-in.com:29000/magic/web/index.html' +VITE_INTERFACE_URL='http://10.56.17.106:25111/magic/web/index.html' +#VITE_INTERFACE_URL='http://dev.ccwin-in.com:25111/magic/web/index.html' # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:29000' +VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25111' # 租户配置 -VITE_TENANT='["长春","成都"]' +VITE_TENANT='["东驰新能源"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' @@ -47,4 +49,4 @@ VITE_NEED_CODE = true # 是否需要下载PDA链接 -VITE_PDA_URL = true \ No newline at end of file +VITE_PDA_URL = true diff --git a/.env.wyf b/.env.wyf index 8959203..03c5df9 100644 --- a/.env.wyf +++ b/.env.wyf @@ -1,46 +1,64 @@ -# 开发环境 -NODE_ENV=development +# 生产环境 +NODE_ENV=test VITE_DEV=false -# 请求路径 -VITE_BASE_URL='http://192.168.0.105:12080' +# # 请求路径 +# VITE_BASE_URL='http://192.168.0.113:12080' +# # 上传路径 +# VITE_UPLOAD_URL='http://192.168.0.113:12080/admin-api/infra/file/upload' +# # 请求路径 +# VITE_BASE_URL='https://scp.faway-hella.com/api' +# # 上传路径 +# VITE_UPLOAD_URL='https://scp.faway-hella.com/api/admin-api/infra/file/upload' +# 请求路径 +VITE_BASE_URL='http://172.21.32.13/api' # 上传路径 -VITE_UPLOAD_URL='http://192.168.0.105:12080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://172.21.32.13/api/admin-api/infra/file/upload' + + +# # 请求路径 +# VITE_BASE_URL='http://dev.ccwin-in.com:25300/api' + +# # 上传路径 +# VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload' # 接口前缀 -VITE_API_BASEPATH=/dev-api +VITE_API_BASEPATH= # 接口地址 VITE_API_URL=/admin-api -# 打包路径 -VITE_BASE_PATH=/ - # 是否删除debugger VITE_DROP_DEBUGGER=true # 是否删除console.log -VITE_DROP_CONSOLE=false +VITE_DROP_CONSOLE=true # 是否sourcemap VITE_SOURCEMAP=false +# 打包路径 +VITE_BASE_PATH=/ + # 输出路径 -VITE_OUT_DIR=dist +VITE_OUT_DIR=sfms3.0 + +# # 自定义接口路径 +# VITE_INTERFACE_URL='http://192.168.0.108:12080/magic/web/index.html' + +# # 积木报表请求路径 +# VITE_JMREPORT_BASE_URL='http://192.168.0.108:12080' # 自定义接口路径 -VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html' +VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://localhost:12080' +VITE_JMREPORT_BASE_URL='http://192.168.0.108:12080' # 租户配置 VITE_TENANT='["东驰新能源"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' - -# 是否需要验证码 -VITE_NEED_CODE = false diff --git a/src/views/ccwin/eqBlender/eqBlender.data.ts b/src/views/ccwin/eqBlender/eqBlender.data.ts index 23726eb..3647fdf 100644 --- a/src/views/ccwin/eqBlender/eqBlender.data.ts +++ b/src/views/ccwin/eqBlender/eqBlender.data.ts @@ -22,7 +22,7 @@ export const EqBlender = useCrudSchemas(reactive([ label: '数据点名称', field: 'iname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '采集值', @@ -31,16 +31,16 @@ export const EqBlender = useCrudSchemas(reactive([ isSearch: false, }, { - label: '仪表的编号', + label: '设备编号', field: 'mcode', sort: 'custom', - isSearch: false, + isSearch: true, }, { - label: '仪表的名称', + label: '设备名称', field: 'mname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '创建时间', diff --git a/src/views/ccwin/eqCoater/eqCoater.data.ts b/src/views/ccwin/eqCoater/eqCoater.data.ts index 7a9eceb..b9feaea 100644 --- a/src/views/ccwin/eqCoater/eqCoater.data.ts +++ b/src/views/ccwin/eqCoater/eqCoater.data.ts @@ -22,7 +22,7 @@ export const EqCoater = useCrudSchemas(reactive([ label: '数据点名称', field: 'iname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '采集值', @@ -31,16 +31,16 @@ export const EqCoater = useCrudSchemas(reactive([ isSearch: false, }, { - label: '仪表的编号', + label: '设备编号', field: 'mcode', sort: 'custom', - isSearch: false, + isSearch: true, }, { - label: '仪表的名称', + label: '设备名称', field: 'mname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '创建时间', diff --git a/src/views/ccwin/eqFine/eqFine.data.ts b/src/views/ccwin/eqFine/eqFine.data.ts index 26d5444..82bdb90 100644 --- a/src/views/ccwin/eqFine/eqFine.data.ts +++ b/src/views/ccwin/eqFine/eqFine.data.ts @@ -22,7 +22,7 @@ export const EqFine = useCrudSchemas(reactive([ label: '数据点名称', field: 'iname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '采集值', @@ -31,16 +31,16 @@ export const EqFine = useCrudSchemas(reactive([ isSearch: false, }, { - label: '仪表的编号', + label: '设备编号', field: 'mcode', sort: 'custom', - isSearch: false, + isSearch: true, }, { - label: '仪表的名称', + label: '设备名称', field: 'mname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '创建时间', diff --git a/src/views/ccwin/eqPre/eqPre.data.ts b/src/views/ccwin/eqPre/eqPre.data.ts index b594f6e..04d2ab7 100644 --- a/src/views/ccwin/eqPre/eqPre.data.ts +++ b/src/views/ccwin/eqPre/eqPre.data.ts @@ -22,7 +22,7 @@ export const EqPre = useCrudSchemas(reactive([ label: '数据点名称', field: 'iname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '采集值', @@ -31,16 +31,16 @@ export const EqPre = useCrudSchemas(reactive([ isSearch: false, }, { - label: '仪表的编号', + label: '设备编号', field: 'mcode', sort: 'custom', - isSearch: false, + isSearch: true, }, { - label: '仪表的名称', + label: '设备名称', field: 'mname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '创建时间', diff --git a/src/views/ccwin/eqRollsqueezer/eqRollsqueezer.data.ts b/src/views/ccwin/eqRollsqueezer/eqRollsqueezer.data.ts index 42a7895..7cea9dd 100644 --- a/src/views/ccwin/eqRollsqueezer/eqRollsqueezer.data.ts +++ b/src/views/ccwin/eqRollsqueezer/eqRollsqueezer.data.ts @@ -22,7 +22,7 @@ export const EqRollsqueezer = useCrudSchemas(reactive([ label: '数据点名称', field: 'iname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '采集值', @@ -31,16 +31,16 @@ export const EqRollsqueezer = useCrudSchemas(reactive([ isSearch: false, }, { - label: '仪表的编号', + label: '设备编号', field: 'mcode', sort: 'custom', - isSearch: false, + isSearch: true, }, { - label: '仪表的名称', + label: '设备名称', field: 'mname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '创建时间', diff --git a/src/views/ccwin/eqStacking/eqStacking.data.ts b/src/views/ccwin/eqStacking/eqStacking.data.ts index 5359192..04a6c85 100644 --- a/src/views/ccwin/eqStacking/eqStacking.data.ts +++ b/src/views/ccwin/eqStacking/eqStacking.data.ts @@ -22,7 +22,7 @@ export const EqStacking = useCrudSchemas(reactive([ label: '数据点名称', field: 'iname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '采集值', @@ -31,16 +31,16 @@ export const EqStacking = useCrudSchemas(reactive([ isSearch: false, }, { - label: '仪表的编号', + label: '设备编号', field: 'mcode', sort: 'custom', - isSearch: false, + isSearch: true, }, { - label: '仪表的名称', + label: '设备名称', field: 'mname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '创建时间', diff --git a/src/views/ccwin/paAc/paAc.data.ts b/src/views/ccwin/paAc/paAc.data.ts index f6ea4ba..95284ab 100644 --- a/src/views/ccwin/paAc/paAc.data.ts +++ b/src/views/ccwin/paAc/paAc.data.ts @@ -22,7 +22,7 @@ export const PaAc = useCrudSchemas(reactive([ label: '数据点名称', field: 'iname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '采集值', @@ -31,16 +31,16 @@ export const PaAc = useCrudSchemas(reactive([ isSearch: false, }, { - label: '仪表的编号', + label: '设备编号', field: 'mcode', sort: 'custom', - isSearch: false, + isSearch: true, }, { - label: '仪表的名称', + label: '设备名称', field: 'mname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '创建时间', diff --git a/src/views/ccwin/paDhu/paDhu.data.ts b/src/views/ccwin/paDhu/paDhu.data.ts index 298d502..0d00a51 100644 --- a/src/views/ccwin/paDhu/paDhu.data.ts +++ b/src/views/ccwin/paDhu/paDhu.data.ts @@ -1,4 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const PaDhuRules = reactive({ }) @@ -29,32 +30,32 @@ export const PaDhu = useCrudSchemas(reactive([ isSearch: false, }, { - label: '仪表的编号', + label: '设备编号', field: 'mcode', sort: 'custom', isSearch: true, }, { - label: '仪表的名称', + label: '设备名称', field: 'mname', sort: 'custom', isSearch: true, - // }, - // { - // label: '创建时间', - // field: 'createTime', - // sort: 'custom', - // formatter: dateFormatter, - // isSearch: true, - // search: { - // component: 'DatePicker', - // componentProps: { - // valueFormat: 'YYYY-MM-DD HH:mm:ss', - // type: 'daterange', - // defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - // } - // }, - // isForm: false, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, // }, // { // label: '操作', diff --git a/src/views/ccwin/paLoopwater/paLoopwater.data.ts b/src/views/ccwin/paLoopwater/paLoopwater.data.ts index 06d3ae6..0156e75 100644 --- a/src/views/ccwin/paLoopwater/paLoopwater.data.ts +++ b/src/views/ccwin/paLoopwater/paLoopwater.data.ts @@ -22,7 +22,7 @@ export const PaLoopwater = useCrudSchemas(reactive([ label: '数据点名称', field: 'iname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '采集值', @@ -31,16 +31,16 @@ export const PaLoopwater = useCrudSchemas(reactive([ isSearch: false, }, { - label: '仪表的编号', + label: '设备编号', field: 'mcode', sort: 'custom', - isSearch: false, + isSearch: true, }, { - label: '仪表的名称', + label: '设备名称', field: 'mname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '创建时间', diff --git a/src/views/ccwin/paRo/paRo.data.ts b/src/views/ccwin/paRo/paRo.data.ts index eb299f9..9a368a8 100644 --- a/src/views/ccwin/paRo/paRo.data.ts +++ b/src/views/ccwin/paRo/paRo.data.ts @@ -22,7 +22,7 @@ export const PaRo = useCrudSchemas(reactive([ label: '数据点名称', field: 'iname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '采集值', @@ -31,16 +31,16 @@ export const PaRo = useCrudSchemas(reactive([ isSearch: false, }, { - label: '仪表的编号', + label: '设备编号', field: 'mcode', sort: 'custom', - isSearch: false, + isSearch: true, }, { - label: '仪表的名称', + label: '设备名称', field: 'mname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '创建时间', diff --git a/src/views/ccwin/paVacuo/paVacuo.data.ts b/src/views/ccwin/paVacuo/paVacuo.data.ts index 6a8a2a1..15572bd 100644 --- a/src/views/ccwin/paVacuo/paVacuo.data.ts +++ b/src/views/ccwin/paVacuo/paVacuo.data.ts @@ -1,4 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const PaVacuoRules = reactive({ @@ -30,32 +31,32 @@ export const PaVacuo = useCrudSchemas(reactive([ isSearch: false, }, { - label: '仪表的编号', + label: '设备编号', field: 'mcode', sort: 'custom', isSearch: true, }, { - label: '仪表的名称', + label: '设备名称', field: 'mname', sort: 'custom', isSearch: true, - // }, - // { - // label: '创建时间', - // field: 'createTime', - // sort: 'custom', - // formatter: dateFormatter, - // isSearch: true, - // search: { - // component: 'DatePicker', - // componentProps: { - // valueFormat: 'YYYY-MM-DD HH:mm:ss', - // type: 'daterange', - // defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - // } - // }, - // isForm: false, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, // }, // { // label: '操作', diff --git a/src/views/ccwin/paWastewater/paWastewater.data.ts b/src/views/ccwin/paWastewater/paWastewater.data.ts index 2cd28c0..daf8765 100644 --- a/src/views/ccwin/paWastewater/paWastewater.data.ts +++ b/src/views/ccwin/paWastewater/paWastewater.data.ts @@ -22,7 +22,7 @@ export const PaWastewater = useCrudSchemas(reactive([ label: '数据点名称', field: 'iname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '采集值', @@ -31,16 +31,16 @@ export const PaWastewater = useCrudSchemas(reactive([ isSearch: false, }, { - label: '仪表的编号', + label: '设备编号', field: 'mcode', sort: 'custom', - isSearch: false, + isSearch: true, }, { - label: '仪表的名称', + label: '设备名称', field: 'mname', sort: 'custom', - isSearch: false, + isSearch: true, }, { label: '创建时间',