diff --git a/.env.dev b/.env.dev index 1da25e71..16e36043 100644 --- a/.env.dev +++ b/.env.dev @@ -1,8 +1,8 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-11-21 10:36:47 - # @LastEditors: DY + # @LastEditTime: 2023-12-13 15:33:20 + # @LastEditors: zhp # @Description: ### # 开发环境配置 @@ -13,7 +13,7 @@ VUE_APP_TITLE = MES系统 # 芋道管理系统/开发环境 # VUE_APP_BASE_API = 'http://100.64.0.26:48082' -VUE_APP_BASE_API = 'http://192.168.0.33:48082' +# VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.4.173:48080' # VUE_APP_BASE_API = 'http://192.168.2.173:48080' # VUE_APP_BASE_API = 'http://192.168.1.49:48082' @@ -21,7 +21,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.4.159:48080' # VUE_APP_BASE_API = 'http://192.168.1.56:48082' # VUE_APP_BASE_API = 'http://192.168.4.159:48080' - +VUE_APP_BASE_API = 'http://192.168.1.78:48082' # 积木报表指向地址 VUE_APP_JIMU_API = 'http://192.168.0.33:48082' diff --git a/package.json b/package.json index abeb01a6..556024f1 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "benz-amr-recorder": "^1.1.5", "bpmn-js-token-simulation": "0.10.0", "clipboard": "2.0.8", - "code-brick-zj": "^1.0.2", + "code-brick-zj": "^1.0.5", "core-js": "^3.26.0", "crypto-js": "^4.0.0", "diagram-js": "^12.3.0", diff --git a/src/api/base/qualityHotMaterial.js b/src/api/base/qualityHotMaterial.js new file mode 100644 index 00000000..23ceeeb1 --- /dev/null +++ b/src/api/base/qualityHotMaterial.js @@ -0,0 +1,101 @@ + +/* + * @Author: zhp + * @Date: 2023-11-06 15:38:12 + * @LastEditTime: 2023-12-08 16:08:35 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 创建质量检测类型基础 +export function createQualityHotMaterial(data) { + return request({ + url: '/base/quality-hot-material/create', + method: 'post', + data: data + }) +} + +// 更新质量检测类型基础 +export function updateQualityHotMaterial(data) { + return request({ + url: '/base/quality-hot-material/update', + method: 'put', + data: data + }) +} + +// 删除质量检测类型基础 +export function deleteQualityHotMaterial(id) { + return request({ + url: '/base/quality-hot-material/delete?id=' + id, + method: 'delete' + }) +} + +// 获得质量检测类型基础 +export function getQualityHotMaterial(id) { + return request({ + url: '/base/quality-hot-material/get?id=' + id, + method: 'get' + }) +} + +// 获得质量检测类型基础分页 +export function getQualityHotMaterialPage(query) { + return request({ + url: 'base/quality-hot-material/page', + method: 'get', + params: query + }) +} + +// 导出质量检测类型基础 Excel +// export function exportQualityScrapTypeExcel(query) { +// return request({ +// url: '/base/quality-scrap-type/export-excel', +// method: 'get', +// params: query, +// responseType: 'blob' +// }) +// } + +export function getCode(query) { + return request({ + url: '/base/quality-hot-material/getCode', + method: 'get', + params: query + }) +} +export function getHotMaterialAllList(query) { + return request({ + url: '/base/core-hot-material/listAll', + method: 'get', + params: query + }) +} + +export function getSupplierList(query) { + return request({ + url: '/base/core-supplier/listAll', + method: 'get', + params: query + }) +} + +export function getWorkerList(query) { + return request({ + url: '/base/core-worker/listAll', + method: 'get', + params: query + }) +} + +export function getMaterialCheckList(query) { + return request({ + url: '/base/core-hot-material-check/listByMaterial', + method: 'get', + params: query + }) +} diff --git a/src/api/base/qualityInspectionBoxBtn.js b/src/api/base/qualityInspectionBoxBtn.js index 44ffd522..45998d1a 100644 --- a/src/api/base/qualityInspectionBoxBtn.js +++ b/src/api/base/qualityInspectionBoxBtn.js @@ -1,10 +1,17 @@ +/* + * @Author: zhp + * @Date: 2023-12-04 14:10:37 + * @LastEditTime: 2023-12-13 16:03:46 + * @LastEditors: zhp + * @Description: + */ import request from '@/utils/request' // 创建安灯按钮16键对应 export function createQualityInspectionBoxBtn(data) { return request({ - url: '/base/quality-inspection-box-btn/create', - method: 'post', + url: '/base/quality-inspection-box-btn/updateBatch', + method: 'put', data: data }) } @@ -52,3 +59,19 @@ export function exportQualityInspectionBoxBtnExcel(query) { responseType: 'blob' }) } + +export function getAllDetByTypeList(query) { + return request({ + url: '/base/quality-scrap-det/scrapMap', + method: 'get', + params: query, + }) +} +export function getListByLineSection(query) { + return request({ + url: '/base/quality-inspection-box-btn/detListByLineSection', + method: 'get', + params: query, + }) +} + diff --git a/src/api/base/qualityScrapDet.js b/src/api/base/qualityScrapDet.js index 1cf724ac..9811bca1 100644 --- a/src/api/base/qualityScrapDet.js +++ b/src/api/base/qualityScrapDet.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2023-11-06 15:38:12 - * @LastEditTime: 2023-11-06 15:39:39 + * @LastEditTime: 2023-12-08 09:46:55 * @LastEditors: zhp * @Description: */ @@ -67,3 +67,4 @@ export function getCode(query) { params: query }) } + diff --git a/src/api/monitoring/qualityIsra.js b/src/api/monitoring/qualityIsra.js new file mode 100644 index 00000000..4c33d57b --- /dev/null +++ b/src/api/monitoring/qualityIsra.js @@ -0,0 +1,63 @@ +/* + * @Author: zhp + * @Date: 2023-12-08 15:26:59 + * @LastEditTime: 2023-12-11 15:21:44 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' +export function getQualityIsraPage(query) { + return request({ + url: 'base/quality-isra-statistics/getIsraData', + method: 'get', + params: query + }) +} + +export function getQualityIsraDayMap(query) { + return request({ + url: '/base/quality-isra-statistics/dayMap', + method: 'get', + params: query + }) +} + +export function getQualityIsraWeekMap(query) { + return request({ + url: '/base/quality-isra-statistics/weekMap', + method: 'get', + params: query + }) +} + +export function getQualityIsraMonthMap(query) { + return request({ + url: '/base/quality-isra-statistics/monthMap', + method: 'get', + params: query + }) +} + +export function getQualityIsraDayList(query) { + return request({ + url: '/base/quality-isra-statistics/dayList', + method: 'get', + params: query + }) +} + +export function getQualityIsraWeekList(query) { + return request({ + url: '/base/quality-isra-statistics/weekList', + method: 'get', + params: query + }) +} + +export function getQualityIsraMonthList(query) { + return request({ + url: '/base/quality-isra-statistics/monthList', + method: 'get', + params: query + }) +} diff --git a/src/api/quality/rawMaterialTraceability.js b/src/api/quality/rawMaterialTraceability.js index aba01790..44d6392d 100644 --- a/src/api/quality/rawMaterialTraceability.js +++ b/src/api/quality/rawMaterialTraceability.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2023-10-31 10:55:20 - * @LastEditTime: 2023-10-31 15:05:30 + * @LastEditTime: 2023-12-06 14:09:14 * @LastEditors: zhp * @Description: */ @@ -33,3 +33,12 @@ export function exportEnergyPlcExcel(query) { responseType: 'blob' }) } + +export function getOriginalGlassRetrace(query) { + return request({ + url: '/base/original-glass-statistics/originalGlassRetrace', + method: 'get', + params: query, + }) +} + diff --git a/src/api/report/production.js b/src/api/report/production.js new file mode 100644 index 00000000..aecf5bda --- /dev/null +++ b/src/api/report/production.js @@ -0,0 +1,41 @@ +/* + * @Author: zhp + * @Date: 2023-12-12 13:49:02 + * @LastEditTime: 2023-12-13 15:52:11 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 获得质量检查信息记录表分页 + +export function getProductionDataList(query) { + return request({ + url: '/base/report-auto-production/listPlus', + method: 'get', + data: query, + }) +} + +export function updateProductionDataList(query) { + return request({ + url: '/base/report-auto-production/updatePlus', + method: 'put', + data: query, + }) +} +export function updateSumProductionDataList(query) { + return request({ + url: '/base/report-auto-production/update', + method: 'put', + data: query, + }) +} + +export function getAutoDeliveDataList(query) { + return request({ + url: '/base/report-auto-delive/listPlus', + method: 'put', + data: query, + }) +} diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index 1b0d68c1..dc9fc82d 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -125,9 +125,7 @@ export default { // 取消自动聚焦 start this.$nextTick(() => { this.Quill?.blur(); - if (!this.readOnly) { - this.Quill?.enable(); - } + this.Quill?.enable(true); }); // 如果设置了上传地址则自定义图片上传事件 if (this.type === 'url') { diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js index 532b615c..657d261e 100644 --- a/src/mixins/lb/basicPageMixin.js +++ b/src/mixins/lb/basicPageMixin.js @@ -78,7 +78,6 @@ export default { return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload); }, del(payload) { - debugger; return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload); }, diff --git a/src/views/base/coreEquipment/index.vue b/src/views/base/coreEquipment/index.vue index d040fed3..4a191a3b 100644 --- a/src/views/base/coreEquipment/index.vue +++ b/src/views/base/coreEquipment/index.vue @@ -248,6 +248,9 @@ export default { label: '设备编码', prop: 'code', url: '/base/core-equipment/getCode', + rules: [ + { required: true, message: '设备编码不能为空', trigger: 'blur' }, + ], }, { input: true, diff --git a/src/views/core/mixins/basic-add.js b/src/views/core/mixins/basic-add.js index 5b0754dd..2f725af8 100644 --- a/src/views/core/mixins/basic-add.js +++ b/src/views/core/mixins/basic-add.js @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2022-08-24 11:19:43 * @LastEditors: zhp - * @LastEditTime: 2023-11-06 15:59:53 + * @LastEditTime: 2023-12-13 15:52:53 * @Description: */ export default { @@ -38,7 +38,7 @@ export default { this.$refs["dataForm"].resetFields(); if (this.dataForm.id) { this.urlOptions.infoURL(id).then(response => { - this.dataForm = response.data; + this.dataForm = response.data if (this.setData) { this.setDataForm() } @@ -80,7 +80,7 @@ export default { if (this.dataForm.id) { this.urlOptions.updateURL(this.dataForm).then(response => { this.$modal.msgSuccess("修改成功"); - this.visible = false; + this.visible = false; this.$emit("refreshDataList"); }); return; diff --git a/src/views/equipment/analysis/Visualization/index.vue b/src/views/equipment/analysis/Visualization/index.vue index d311dbde..c8d32ca8 100644 --- a/src/views/equipment/analysis/Visualization/index.vue +++ b/src/views/equipment/analysis/Visualization/index.vue @@ -27,20 +27,20 @@
- 工作时长 + 有效时长
- 停机时长 + 关机时长
- 故障时长 + 中断时长
-
+
@@ -389,14 +389,14 @@ export default { position: relative; padding: 4px 0; padding-left: 12px; - font-size: 14px; + font-size: 18px; &::before { content: ''; position: absolute; left: 0; top: 6px; - height: 16px; + height: 20px; width: 4px; border-radius: 1px; background: #0b58ff; diff --git a/src/views/equipment/analysis/efficiency/components/pieChart.vue b/src/views/equipment/analysis/efficiency/components/pieChart.vue index 27f30311..7417bac1 100644 --- a/src/views/equipment/analysis/efficiency/components/pieChart.vue +++ b/src/views/equipment/analysis/efficiency/components/pieChart.vue @@ -16,23 +16,22 @@
{{ textData.workTime }}
-
工作时长
+
有效时长
{{ textData.stopTime }}
-
停机时长
+
关机时长
{{ textData.downTime }}
-
故障时长
+
中断时长
-
- +
@@ -93,7 +92,7 @@ export default { // 外环 name: '', type: 'pie', - radius: ['75%', '90%'], + radius: ['60%', '90%'], center: ['50%', '48%'], label: { show: false, @@ -259,7 +258,7 @@ export default { } .data-view__item__title { - font-size: 8px; + font-size: 14px; line-height: 14px; } diff --git a/src/views/equipment/analysis/efficiency/index.vue b/src/views/equipment/analysis/efficiency/index.vue index cc49a574..94d7571a 100644 --- a/src/views/equipment/analysis/efficiency/index.vue +++ b/src/views/equipment/analysis/efficiency/index.vue @@ -19,6 +19,7 @@ :page="1" :limit="10" :table-data="list" + height="65vh" @emitFun="handleEmitFun" />