diff --git a/.env.hella15 b/.env.hella15 index dc2a813d1..15f726a54 100644 --- a/.env.hella15 +++ b/.env.hella15 @@ -4,10 +4,10 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://172.21.32.15/api' +VITE_BASE_URL='https://172.21.32.15:55563/api' # 上传路径 -VITE_UPLOAD_URL='http://172.21.32.15/api/admin-api/infra/file/upload' +VITE_UPLOAD_URL='https://172.21.32.15:55563/api/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH= @@ -37,4 +37,4 @@ VITE_INTERFACE_URL='http://172.21.32.15:90/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://172.21.32.15:90' # 租户配置 -VITE_TENANT='["长春"]' +VITE_TENANT='["长春","成都"]' diff --git a/.env.hella16 b/.env.hella16 index 9672dcd3e..251fa31e6 100644 --- a/.env.hella16 +++ b/.env.hella16 @@ -4,10 +4,10 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://172.21.32.16/api' +VITE_BASE_URL='https://172.21.32.16:55563/api' # 上传路径 -VITE_UPLOAD_URL='http://172.21.32.16/api/admin-api/infra/file/upload' +VITE_UPLOAD_URL='https://172.21.32.16:55563/api/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH= diff --git a/nginx_prod.conf b/nginx_prod.conf index b849be01c..225deb142 100644 --- a/nginx_prod.conf +++ b/nginx_prod.conf @@ -49,5 +49,29 @@ http { index index.html index.htm; } } + server { + listen 55563 ssl; + server_name_in_redirect off; + server_name _; + ssl_certificate /opt/faway-hella/faway-hella.com.pem; + ssl_certificate_key /opt/faway-hella/faway-hella.com.key; + location /api/ { + proxy_pass http://sfms3.0/; + proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; + proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $http_x_forwarded_for; + } + location /profile/ { + alias /opt/profile/; + index index.html index.htm; + } + location / { + try_files $uri $uri/ /index.html; + root /opt/sfms3.0; + index index.html index.htm; + } + } } diff --git a/src/api/eam/basicDocumentType/index.ts b/src/api/eam/basicDocumentType/index.ts index 0ab30af39..ec53a58df 100644 --- a/src/api/eam/basicDocumentType/index.ts +++ b/src/api/eam/basicDocumentType/index.ts @@ -48,7 +48,12 @@ export const deleteDocumentType = async (id: number) => { // 导出文档类型 Excel export const exportDocumentType = async (params) => { - return await request.download({ url: `/eam/document-type/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/eam/document-type/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/eam/document-type/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/eam/basicFaultCause/index.ts b/src/api/eam/basicFaultCause/index.ts index ff5aed0e5..ffffb2d80 100644 --- a/src/api/eam/basicFaultCause/index.ts +++ b/src/api/eam/basicFaultCause/index.ts @@ -49,7 +49,12 @@ export const deleteBasicFaultCause = async (id: number) => { // 导出故障原因 Excel export const exportBasicFaultCause = async (params) => { - return await request.download({ url: `/eam/basic-fault-cause/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/eam/basic-fault-cause/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/eam/basic-fault-cause/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/eam/basicFaultType/index.ts b/src/api/eam/basicFaultType/index.ts index 899b82ec4..3af2b44ce 100644 --- a/src/api/eam/basicFaultType/index.ts +++ b/src/api/eam/basicFaultType/index.ts @@ -48,7 +48,12 @@ export const deleteBasicFaultType = async (id: number) => { // 导出故障类型 Excel export const exportBasicFaultType = async (params) => { - return await request.download({ url: `/eam/basic-fault-type/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/eam/basic-fault-type/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/eam/basic-fault-type/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/eam/equipmentMainPart/index.ts b/src/api/eam/equipmentMainPart/index.ts index a5d7acdd2..6a081dd4c 100644 --- a/src/api/eam/equipmentMainPart/index.ts +++ b/src/api/eam/equipmentMainPart/index.ts @@ -48,7 +48,12 @@ export const deleteEquipmentMainPart = async (id: number) => { // 导出主要部件 Excel export const exportEquipmentMainPart = async (params) => { - return await request.download({ url: `/eam/equipment-main-part/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/eam/equipment-main-part/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/eam/equipment-main-part/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/eam/inspectionItem/index.ts b/src/api/eam/inspectionItem/index.ts index a4b441c0c..86b606728 100644 --- a/src/api/eam/inspectionItem/index.ts +++ b/src/api/eam/inspectionItem/index.ts @@ -48,7 +48,12 @@ export const deleteInspectionItem = async (id: number) => { // 导出巡检项 Excel export const exportInspectionItem = async (params) => { - return await request.download({ url: `/eam/basic/inspection-item/export-excel`, params }) + if (params.isSearch) { + const data = { ...params } + return await request.downloadPost({ url: `/eam/basic/inspection-item/export-excel-senior`, data }) + } else { + return await request.download({ url: `/eam/basic/inspection-item/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/eam/spotCheckItem/index.ts b/src/api/eam/spotCheckItem/index.ts index 0d2bac635..e1f587c23 100644 --- a/src/api/eam/spotCheckItem/index.ts +++ b/src/api/eam/spotCheckItem/index.ts @@ -47,7 +47,13 @@ export const deleteSpotCheckItem = async (id: number) => { // 导出点检项 Excel export const exportSpotCheckItem = async (params) => { - return await request.download({ url: `/eam/basic/spot-check-item/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.downloadPost({ url: `/eam/basic/spot-check-item/export-excel-senior`, data }) + } else { + return await request.download({ url: `/eam/basic/spot-check-item/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/views/eam/basicDocumentType/basicDocumentType.data.ts b/src/views/eam/basicDocumentType/basicDocumentType.data.ts index 38605efc5..0456ee3c7 100644 --- a/src/views/eam/basicDocumentType/basicDocumentType.data.ts +++ b/src/views/eam/basicDocumentType/basicDocumentType.data.ts @@ -35,7 +35,12 @@ export const DocumentType = useCrudSchemas(reactive([ label: '类型设备', field: 'type', sort: 'custom', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 isSearch: true, + form: { + component: 'Select' + } }, { label: '创建时间', @@ -81,14 +86,13 @@ export const DocumentType = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, }, { label: '删除时间', diff --git a/src/views/eam/basicFaultCause/basicFaultCause.data.ts b/src/views/eam/basicFaultCause/basicFaultCause.data.ts index 3704d71a1..3dc367434 100644 --- a/src/views/eam/basicFaultCause/basicFaultCause.data.ts +++ b/src/views/eam/basicFaultCause/basicFaultCause.data.ts @@ -92,14 +92,13 @@ export const BasicFaultCause = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, }, { label: '删除时间', diff --git a/src/views/eam/basicFaultType/basicFaultType.data.ts b/src/views/eam/basicFaultType/basicFaultType.data.ts index 4a2802690..8fe42a032 100644 --- a/src/views/eam/basicFaultType/basicFaultType.data.ts +++ b/src/views/eam/basicFaultType/basicFaultType.data.ts @@ -79,14 +79,13 @@ export const BasicFaultType = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, }, { label: '删除时间', diff --git a/src/views/eam/basicInspectionOption/basicInspectionOption.data.ts b/src/views/eam/basicInspectionOption/basicInspectionOption.data.ts index 6e7fe83bf..d826259c0 100644 --- a/src/views/eam/basicInspectionOption/basicInspectionOption.data.ts +++ b/src/views/eam/basicInspectionOption/basicInspectionOption.data.ts @@ -51,7 +51,7 @@ export const BasicInspectionOption = useCrudSchemas(reactive([ }, }, { - label: '来源于类型配置', + label: '巡检项', field: 'type', sort: 'custom', isSearch: true, diff --git a/src/views/eam/basicMaintenanceOption/basicMaintenanceOption.data.ts b/src/views/eam/basicMaintenanceOption/basicMaintenanceOption.data.ts index fe26160a5..b3fdbcfb2 100644 --- a/src/views/eam/basicMaintenanceOption/basicMaintenanceOption.data.ts +++ b/src/views/eam/basicMaintenanceOption/basicMaintenanceOption.data.ts @@ -51,7 +51,7 @@ export const BasicMaintenanceOption = useCrudSchemas(reactive([ }, }, { - label: '来源于类型配置', + label: '保养项', field: 'type', sort: 'custom', isSearch: true, diff --git a/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts b/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts index efba49dec..ed90c0233 100644 --- a/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts +++ b/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts @@ -31,10 +31,15 @@ export const EquipmentMainPart = useCrudSchemas(reactive([ isSearch: true, }, { - label: '设备工装枚举', + label: '类型', field: 'type', sort: 'custom', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 isSearch: true, + form: { + component: 'Select' + } }, { label: '创建时间', @@ -77,18 +82,16 @@ export const EquipmentMainPart = useCrudSchemas(reactive([ isDetail:false, }, { - label: '是否可用', + label: '是否启用', field: 'available', sort: 'custom', - isSearch: true, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, }, { label: '删除时间', diff --git a/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts b/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts index 1050b4ee3..0be8d0a86 100644 --- a/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts +++ b/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts @@ -96,6 +96,18 @@ export const EquipmentManufacturer = useCrudSchemas(reactive([ } } }, + { + label: '是否启用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, + }, { label: '备注', field: 'remark', diff --git a/src/views/eam/equipmentManufacturer/index.vue b/src/views/eam/equipmentManufacturer/index.vue index 3189ad974..b30215282 100644 --- a/src/views/eam/equipmentManufacturer/index.vue +++ b/src/views/eam/equipmentManufacturer/index.vue @@ -33,7 +33,7 @@ @@ -90,6 +90,15 @@ const updataTableColumns = (val) => { tableColumns.value = val } + +const judgeStatus = (row) =>{ + if(row.available === 'TRUE'){ + return true + }else{ + return false + } +} + const { tableObject, tableMethods } = useTable({ getListApi: EquipmentManufacturerApi.getEquipmentManufacturerPage // 分页接口 }) @@ -132,10 +141,13 @@ const buttonBaseClick = (val, item) => { } // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return [ defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-manufacturer:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hasPermi:'eam:inspection-item:enable',hide: judgeStatus(row)}), // 启用 + defaultButtons.mainListDisableBtn({hasPermi:'eam:inspection-item:disable',hide: !judgeStatus(row)}), // 禁用 // defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-manufacturer:delete'}), // 删除 -] +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -143,6 +155,10 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { // 启用 + handleEnable(row,'TRUE') + }else if (val == 'disable') {// 禁用 + handleEnable(row,'FALSE') } } @@ -235,6 +251,17 @@ const searchFormClick = (searchData) => { getList() // 刷新当前列表 } +const handleEnable = (row,enable) =>{ + message.confirm(t('您确定'+(enable=='TRUE'?'启用':'禁用')+'该项吗, 是否继续?')).then(() => { + row.available = enable + EquipmentManufacturerApi.updateEquipmentManufacturer(row).then(res => { + message.success(t('common.updateSuccess')) + getList() + }) + }) + +} + /** 初始化 **/ onMounted(async () => { getList() diff --git a/src/views/eam/equipmentSupplier/equipmentSupplier.data.ts b/src/views/eam/equipmentSupplier/equipmentSupplier.data.ts index d4f9d4548..7e7fc6377 100644 --- a/src/views/eam/equipmentSupplier/equipmentSupplier.data.ts +++ b/src/views/eam/equipmentSupplier/equipmentSupplier.data.ts @@ -102,6 +102,18 @@ export const EquipmentSupplier = useCrudSchemas(reactive([ } } }, + { + label: '是否启用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, + }, { label: '备注', field: 'remark', diff --git a/src/views/eam/equipmentSupplier/index.vue b/src/views/eam/equipmentSupplier/index.vue index 3a41de721..e9ffeac07 100644 --- a/src/views/eam/equipmentSupplier/index.vue +++ b/src/views/eam/equipmentSupplier/index.vue @@ -33,7 +33,7 @@ @@ -90,6 +90,15 @@ const updataTableColumns = (val) => { tableColumns.value = val } + +const judgeStatus = (row) =>{ + if(row.available === 'TRUE'){ + return true + }else{ + return false + } +} + const { tableObject, tableMethods } = useTable({ getListApi: EquipmentSupplierApi.getEquipmentSupplierPage // 分页接口 }) @@ -132,10 +141,13 @@ const buttonBaseClick = (val, item) => { } // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return [ defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-supplier:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hasPermi:'eam:inspection-item:enable',hide: judgeStatus(row)}), // 启用 + defaultButtons.mainListDisableBtn({hasPermi:'eam:inspection-item:disable',hide: !judgeStatus(row)}), // 禁用 // defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-supplier:delete'}), // 删除 -] +]} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -143,6 +155,10 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if (val == 'enable') { // 启用 + handleEnable(row,'TRUE') + }else if (val == 'disable') {// 禁用 + handleEnable(row,'FALSE') } } @@ -235,6 +251,16 @@ const searchFormClick = (searchData) => { getList() // 刷新当前列表 } +const handleEnable = (row,enable) =>{ + message.confirm(t('您确定'+(enable=='TRUE'?'启用':'禁用')+'该项吗, 是否继续?')).then(() => { + row.available = enable + EquipmentSupplierApi.updateEquipmentSupplier(row).then(res => { + message.success(t('common.updateSuccess')) + getList() + }) + }) +} + /** 初始化 **/ onMounted(async () => { getList() diff --git a/src/views/eam/inspectionItem/index.vue b/src/views/eam/inspectionItem/index.vue index 2b72fdde4..fb132513f 100644 --- a/src/views/eam/inspectionItem/index.vue +++ b/src/views/eam/inspectionItem/index.vue @@ -253,16 +253,15 @@ const searchFormClick = (searchData) => { } const handleEnable = (row,enable) =>{ - row.available = enable - InspectionItemApi.updateInspectionItem(row).then(res => { - message.success(t('common.updateSuccess')) - getList() - }) + message.confirm(t('您确定'+(enable=='TRUE'?'启用':'禁用')+'该项吗, 是否继续?')).then(() => { + row.available = enable + InspectionItemApi.updateInspectionItem(row).then(res => { + message.success(t('common.updateSuccess')) + getList() + }) + }) } - - - /** 初始化 **/ onMounted(async () => { getList() diff --git a/src/views/eam/spotCheckItem/index.vue b/src/views/eam/spotCheckItem/index.vue index 1f448a231..6fc7ba504 100644 --- a/src/views/eam/spotCheckItem/index.vue +++ b/src/views/eam/spotCheckItem/index.vue @@ -252,11 +252,13 @@ const searchFormClick = (searchData) => { const handleEnable = (row,enable) =>{ - row.available = enable - SpotCheckItemApi.updateSpotCheckItem(row).then(res => { - message.success(t('common.updateSuccess')) - getList() - }) + message.confirm(t('您确定'+(enable=='TRUE'?'启用':'禁用')+'该项吗, 是否继续?')).then(() => { + row.available = enable + SpotCheckItemApi.updateSpotCheckItem(row).then(res => { + message.success(t('common.updateSuccess')) + getList() + }) + }) } /** 初始化 **/