From 624ed7bc27260ea6c3ec18188cf00a50e32af246 Mon Sep 17 00:00:00 2001 From: helloDy <1615073571@qq.com> Date: Sat, 11 Nov 2023 20:49:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 6 +- src/api/core/analysis/index.js | 5 +- src/api/equipment/analysis/statistics.js | 27 + src/api/equipment/base/alarm/records.js | 60 ++ src/api/equipment/base/inspection/record.js | 62 +++ src/api/equipment/base/inspection/settings.js | 68 +++ src/api/equipment/base/repair.js | 25 + src/api/equipment/base/spare-parts/config.js | 51 ++ src/api/equipment/base/spare-parts/monitor.js | 45 ++ src/components/DialogForm/index.vue | 5 +- src/components/FileUpload/index.vue | 8 +- .../core/analysis/balanceAnalysis/index.vue | 14 +- src/views/core/analysis/balanceChart.vue | 8 +- .../core/analysis/yieldAnalysis/index.vue | 194 +++---- src/views/core/monitoring/auto/index.vue | 4 +- src/views/core/monitoring/data24/index.vue | 5 +- .../equipment/analysis/Statistics/index.vue | 177 ++++++ .../analysis/Visualization/SmallTitle.vue | 65 +++ .../analysis/Visualization/index.vue | 514 ++++++++++++++++++ .../equipment/analysis/efficiency/index.vue | 28 +- .../equipment/analysis/exception/index.vue | 4 +- .../equipment/analysis/quality/index.vue | 4 +- .../base/alarm/Record/SmallTitle.vue | 65 +++ .../base/alarm/Record/add-or-updata.vue | 195 +++++++ .../equipment/base/alarm/Record/index.vue | 350 ++++++++++++ .../base/inspection/Record/addRecord.vue | 393 +++++++++++++ .../base/inspection/Record/attr-add.vue | 148 +++++ .../base/inspection/Record/index.vue | 56 +- .../base/inspection/Settings/SmallTitle.vue | 65 +++ .../inspection/Settings/add-or-updata.vue | 317 +++++++++++ .../base/inspection/Settings/attr-add.vue | 145 +++++ .../base/inspection/Settings/index.vue | 64 ++- .../equipment/base/maintain/Monitor/index.vue | 15 +- .../base/maintain/PlanConfig/index.vue | 26 +- .../equipment/base/maintain/Record/index.vue | 26 +- .../base/repair/CustomDialogForm.vue | 463 ++++++++++------ src/views/equipment/base/repair/index.vue | 84 ++- .../base/spareParts/Config/addSparts.vue | 315 +++++++++++ .../base/spareParts/Config/attr-add.vue | 148 +++++ .../base/spareParts/Config/index.vue | 66 ++- .../equipment/base/spareParts/List/index.vue | 7 +- .../base/spareParts/Monitor/addSparts.vue | 431 +++++++++++++++ .../base/spareParts/Monitor/attr-add.vue | 126 +++++ .../base/spareParts/Monitor/index.vue | 114 ++-- .../monitor/StatusAndParams/index.vue | 338 ++++++++++++ .../equipment/timing-diagram/output/index.vue | 6 +- .../equipment/timing-diagram/status/index.vue | 6 +- .../equipmentProcessAmount/index.vue | 2 +- 48 files changed, 4918 insertions(+), 432 deletions(-) create mode 100644 src/api/equipment/analysis/statistics.js create mode 100644 src/api/equipment/base/alarm/records.js create mode 100644 src/api/equipment/base/inspection/record.js create mode 100644 src/api/equipment/base/inspection/settings.js create mode 100644 src/api/equipment/base/repair.js create mode 100644 src/api/equipment/base/spare-parts/config.js create mode 100644 src/api/equipment/base/spare-parts/monitor.js create mode 100644 src/views/equipment/analysis/Statistics/index.vue create mode 100644 src/views/equipment/analysis/Visualization/SmallTitle.vue create mode 100644 src/views/equipment/analysis/Visualization/index.vue create mode 100644 src/views/equipment/base/alarm/Record/SmallTitle.vue create mode 100644 src/views/equipment/base/alarm/Record/add-or-updata.vue create mode 100644 src/views/equipment/base/alarm/Record/index.vue create mode 100644 src/views/equipment/base/inspection/Record/addRecord.vue create mode 100644 src/views/equipment/base/inspection/Record/attr-add.vue create mode 100644 src/views/equipment/base/inspection/Settings/SmallTitle.vue create mode 100644 src/views/equipment/base/inspection/Settings/add-or-updata.vue create mode 100644 src/views/equipment/base/inspection/Settings/attr-add.vue create mode 100644 src/views/equipment/base/spareParts/Config/addSparts.vue create mode 100644 src/views/equipment/base/spareParts/Config/attr-add.vue create mode 100644 src/views/equipment/base/spareParts/Monitor/addSparts.vue create mode 100644 src/views/equipment/base/spareParts/Monitor/attr-add.vue create mode 100644 src/views/equipment/monitor/StatusAndParams/index.vue diff --git a/.env.dev b/.env.dev index 7e6f2d3f..6a0eb085 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-11-07 09:23:07 + # @LastEditTime: 2023-11-10 17:06:02 # @LastEditors: DY # @Description: ### @@ -13,8 +13,8 @@ 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.4.173:48080' +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:48080' # VUE_APP_BASE_API = 'http://192.168.1.8:48080' diff --git a/src/api/core/analysis/index.js b/src/api/core/analysis/index.js index 394bbdcf..e5f374e9 100644 --- a/src/api/core/analysis/index.js +++ b/src/api/core/analysis/index.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2023-09-12 14:07:04 - * @LastEditTime: 2023-11-07 14:17:38 + * @LastEditTime: 2023-11-10 10:23:43 * @LastEditors: DY * @Description: */ @@ -15,9 +15,10 @@ export function getYieldAnalysisPageData(query) { }) } +// 产线平衡分析 export function getCT(data) { return request({ - url: '/analysis/production-analysis/getCT', + url: '/analysis/equipment-analysis/getCT', method: 'post', data: data }) diff --git a/src/api/equipment/analysis/statistics.js b/src/api/equipment/analysis/statistics.js new file mode 100644 index 00000000..ebd60e17 --- /dev/null +++ b/src/api/equipment/analysis/statistics.js @@ -0,0 +1,27 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-10 09:27:39 + * @LastEditTime: 2023-11-10 09:30:00 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 获得设备统计分析 +export function getEqAnalysis(query) { + return request({ + url: '/analysis/equipment-analysis/statistics', + method: 'get', + params: query + }) +} + +// 导出设备统计分析 +export function exportEqAnalysisExcel(query) { + return request({ + url: '/analysis/equipment-analysis/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} \ No newline at end of file diff --git a/src/api/equipment/base/alarm/records.js b/src/api/equipment/base/alarm/records.js new file mode 100644 index 00000000..8a4104ca --- /dev/null +++ b/src/api/equipment/base/alarm/records.js @@ -0,0 +1,60 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-08 15:56:52 + * @LastEditTime: 2023-11-09 17:42:27 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建设备报警处理 +export function createAlarmHand(data) { + return request({ + url: '/base/equipment-alarm-hand/create', + method: 'post', + data: data + }) +} + +// 更新设备报警处理 +export function updateAlarmHand(data) { + return request({ + url: '/base/equipment-alarm-hand/update', + method: 'put', + data: data + }) +} + +// 删除设备报警处理 +export function deleteAlarmHand(id) { + return request({ + url: '/base/equipment-alarm-hand/delete?id=' + id, + method: 'delete' + }) +} + +//获得设备报警处理 +export function getAlarmHand(id) { + return request({ + url: '/base/equipment-alarm-hand/get?id=' + id, + method: 'get' + }) +} + +// 获得设备报警处理分页 +export function getAlarmHandPage(query) { + return request({ + url: '/base/equipment-alarm-hand/page', + method: 'get', + params: query + }) +} + + +//获得设备报警记录 +export function getAlarmLog(id) { + return request({ + url: '/base/equipment-alarm-log/get?id=' + id, + method: 'get' + }) +} diff --git a/src/api/equipment/base/inspection/record.js b/src/api/equipment/base/inspection/record.js new file mode 100644 index 00000000..5c0e2cb2 --- /dev/null +++ b/src/api/equipment/base/inspection/record.js @@ -0,0 +1,62 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-08 15:56:52 + * @LastEditTime: 2023-11-11 19:52:54 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 根据设备获得所有巡检内容列表 +export function getcheckAllList(query) { + return request({ + url: '/base/equipment-check/listAll', + method: 'get', + params: query + }) +} + +// 创建设备巡检计划记录 +export function createCheckLog(data) { + return request({ + url: '/base/equipment-check-log/create', + method: 'post', + data: data + }) +} + +// 更新设备巡检计划记录 +export function updateCheckLog(data) { + return request({ + url: '/base/equipment-check-log/update', + method: 'put', + data: data + }) +} + +// 获得设备巡检计划记录 +export function getEqCheckLog(id) { + return request({ + url: '/base/equipment-check-log/get?id=' + id, + method: 'get' + }) +} + +// 导出设备巡检计划记录 +export function exportCheckLogExcel(query) { + return request({ + url: '/base/equipment-check-log/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} + +// 根据设备获得所有巡检配置列表 +export function getcheckConfigByEqList(query) { + return request({ + url: '/base/equipment-check-config/list', + method: 'get', + params: query + }) +} diff --git a/src/api/equipment/base/inspection/settings.js b/src/api/equipment/base/inspection/settings.js new file mode 100644 index 00000000..8d2ad8c9 --- /dev/null +++ b/src/api/equipment/base/inspection/settings.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-08 15:56:52 + * @LastEditTime: 2023-11-10 09:04:50 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 获得设备巡检设置 +export function getEqCheck(id) { + return request({ + url: '/base/equipment-check-config/get?id=' + id, + method: 'get' + }) +} + +// 创建巡检项目 +export function createCheckDet(data) { + return request({ + url: '/base/equipment-check-config-det/create', + method: 'post', + data: data + }) +} + +// 更新巡检项目 +export function updateCheckDet(data) { + return request({ + url: '/base/equipment-check-config-det/update', + method: 'put', + data: data + }) +} + +// 删除巡检项目 +export function deleteCheckDet(id) { + return request({ + url: '/base/equipment-check-config-det/delete?id=' + id, + method: 'delete' + }) +} + +//巡检项目 +export function getCheckDet(id) { + return request({ + url: '/base/equipment-check-config-det/get?id=' + id, + method: 'get' + }) +} + +// 获得巡检项目分页 +export function getCheckDetPage(query) { + return request({ + url: '/base/equipment-check-config-det/page', + method: 'get', + params: query + }) +} + +// 获得x巡检所有列表 +export function getcheckList(query) { + return request({ + url: '/base/equipment-check/list', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/equipment/base/repair.js b/src/api/equipment/base/repair.js new file mode 100644 index 00000000..a93e4a9f --- /dev/null +++ b/src/api/equipment/base/repair.js @@ -0,0 +1,25 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-10 16:09:33 + * @LastEditTime: 2023-11-10 16:50:08 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +//获得设备维修 +export function getEqRepair(id) { + return request({ + url: '/base/equipment-repair-log/get?id=' + id, + method: 'get' + }) +} + +// 更新设备维修记录 +export function updateEqRepair(data) { + return request({ + url: '/base/equipment-repair-log/update', + method: 'put', + data: data + }) +} \ No newline at end of file diff --git a/src/api/equipment/base/spare-parts/config.js b/src/api/equipment/base/spare-parts/config.js new file mode 100644 index 00000000..b2201cad --- /dev/null +++ b/src/api/equipment/base/spare-parts/config.js @@ -0,0 +1,51 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-11 16:18:57 + * @LastEditTime: 2023-11-11 17:28:54 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +//获得备品备件配置 +export function getSparePartConfig(id) { + return request({ + url: '/base/equipment-spare-part-config/get?id=' + id, + method: 'get' + }) +} + +// 创建设备备品备件配置--抽屉 +export function createConfigDet(data) { + return request({ + url: '/base/equipment-spare-part-config-det/create', + method: 'post', + data: data + }) +} + +// 删除设备备品备件配置--抽屉 +export function deleteConfigDet(id) { + return request({ + url: '/base/equipment-spare-part-config-det/delete?id=' + id, + method: 'delete' + }) +} + +// 获得抽屉表格分页 +export function getConfigDetPage(query) { + return request({ + url: '/base/equipment-spare-part-config-det/page', + method: 'get', + params: query + }) +} + +// 获得备品备件列表 +export function getSparePartList(query) { + return request({ + url: '/base/equipment-spare-part/list', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/equipment/base/spare-parts/monitor.js b/src/api/equipment/base/spare-parts/monitor.js new file mode 100644 index 00000000..af4f2a42 --- /dev/null +++ b/src/api/equipment/base/spare-parts/monitor.js @@ -0,0 +1,45 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-11 16:18:57 + * @LastEditTime: 2023-11-11 18:44:51 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 获得抽屉表格分页 +export function getConfigDetMonitorPage(query) { + return request({ + url: '/base/equipment-spare-part-config-det/monitor', + method: 'get', + params: query + }) +} + +// 创建设备备品备件更换log +export function createSparePartLog(data) { + return request({ + url: '/base/equipment-spare-part-log/create', + method: 'post', + data: data + }) +} + +// 获得设备备品备件更换log分页 +export function getSparePartLogPage(query) { + return request({ + url: '/base/equipment-spare-part-log/page', + method: 'get', + params: query + }) +} + +// 导出设备备品备件更换log +export function exportSparePartLogExcel(query) { + return request({ + url: '/base/equipment-spare-part-log/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue index f0c324ea..4449dab1 100644 --- a/src/components/DialogForm/index.vue +++ b/src/components/DialogForm/index.vue @@ -66,7 +66,10 @@ :key="col.key" :disabled="disabled" :is="col.subcomponent" - :inlineStyle="col.style"> + v-model="form[col.prop]" + :inlineStyle="col.style" + @on-change="$emit('update', form)" + v-bind="col.bind">
- 选取文件 + 选取文件
请上传 @@ -66,6 +66,11 @@ export default { isShowTip: { type: Boolean, default: true + }, + // 是否禁用 + disabled: { + type: Boolean, + default: false } }, data() { @@ -179,6 +184,7 @@ export default { }, // 获取文件名称 getFileName(name) { + console.log('你好', name) if (name.lastIndexOf("/") > -1) { return name.slice(name.lastIndexOf("/") + 1); } else { diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue index d9f2ecee..7adceb4a 100644 --- a/src/views/core/analysis/balanceAnalysis/index.vue +++ b/src/views/core/analysis/balanceAnalysis/index.vue @@ -4,7 +4,7 @@
- +
@@ -10,7 +10,7 @@
{{ item.name }}
-
+
@@ -48,6 +48,7 @@ export default { } }, mounted() { + // this.initChart() }, methods: { changeChart(index) { @@ -81,7 +82,8 @@ export default { console.log('看一下数据', this.dataArray) this.xDatas = xData this.chart = echarts.init(this.$refs.chartDiv, 'macarons') - this.setOptions(xData, yData[0], lineName) + // this.chart = echarts.init(document.getElementById('chart'), 'macarons') + // this.setOptions(xData, yData[0], lineName) }, setOptions(xData, dataList, lineName) { // let seriesData = [] diff --git a/src/views/core/analysis/yieldAnalysis/index.vue b/src/views/core/analysis/yieldAnalysis/index.vue index e6ef87e5..61db4752 100644 --- a/src/views/core/analysis/yieldAnalysis/index.vue +++ b/src/views/core/analysis/yieldAnalysis/index.vue @@ -21,6 +21,7 @@ import { parseTime } from '../../mixins/code-filter'; import { getYieldAnalysisPageData } from '@/api/core/analysis/index'; // import { getProductionLinePage } from '@/api/core/base/productionLine'; import lineChart from '../LineChart' +import moment from 'moment'; // import { getWorkshopSectionPage } from '@/api/core/base/workshopSection'; // const tableProps = [ @@ -62,6 +63,9 @@ export default { recordTime: [] }, dateLabelList: [], + tempTtime: '', + day: 0, + xData: [], formConfig: [ // { // type: 'select', @@ -109,111 +113,77 @@ export default { // }); // }); // }, - getData() { - // this.listQuery.lineIds = ['1672847052717821953'] - // this.listQuery.productId = val.productId; - // this.listQuery.time = '1694486098000'; - this.urlOptions.getDataListURL(this.listQuery).then(res => { - let arr = [ - { - prop: 'lineName', - label: '产线', - fixed: 'left' - }, - { - prop: 'sum', - label: '合计', - fixed: 'left' - }, - { - prop: res.data ? res.data.nameData[0].name : undefined, - label: res.data ? res.data.nameData[0].name : undefined, - align: 'center', - children:[ - - ] - } - ] - // console.log(res.data.nameData.slice(1)) - let xData = [] - let yAllData = [] - let lineName = [] - if (res.data) { - let tempDateList = [] - res.data.nameData.forEach(date => { - tempDateList.push(date.name) - }) - this.dateLabelList = Array.from(new Set(tempDateList)) - - this.dateLabelList.forEach(item => { - if (item.indexOf('年') === -1) { - // 构造表头 - const props = { - 'prop': item, - 'label': item - } - arr[2].children.push(props) - - // 构造echarts横坐标 - xData.push(item) - } - }) - // res.data.nameData.slice(1).forEach(item => { - // const props = { - // 'prop': item.name, - // 'label': item.name, - // 'align': 'center' - // } - // arr[2].children.push(props) - // }) - let tableDataArr =[] - res.data.data.forEach(item => { - let obj = {} - obj.lineName= item.lineName, - obj.sum= item.sum, - item.data.forEach((ele, index) => { - // console.log(ele) - ele.children.forEach((e) => { - console.log(e.dynamicName) - obj['' + e.dynamicName + ''] = e.dynamicValue - console.log(obj['' + e.dynamicName + '']); - }) - }) - tableDataArr.push(obj) - }); - this.tableData = tableDataArr - this.tableProps = arr - - // let tempList = [] - // res.data.nameData.slice(1).forEach(item => { - // tempList.push(item.name) - // // arr[2].children.push(props) - // }) - // xData = Array.from(new Set(tempList)) - - res.data.data.forEach(item => { - let yData = [] - lineName.push(item.lineName) - // let obj = {} - // obj.lineName = item.lineName, - // obj.sum = item.sum, - item.data.forEach((ele, index) => { - // console.log(ele) - ele.children.forEach((e) => { - // let yData = [] - yData.push(e.dynamicValue) - }) - }) - yAllData.push(yData) - }); - console.log(lineName) - } else { - this.tableProps = arr - this.tableData = [] - xData = [] - yAllData = [] - lineName = [] + // 设置表头和横坐标 + setHeader() { + const month = this.tempTtime.getMonth() + 1 + let arr = [ + { + prop: 'proName', + label: '产品名称', + fixed: 'left' + }, + { + prop: 'specifications', + label: '产品规格', + fixed: 'left' + }, + { + prop: 'sum', + label: '合计', + fixed: 'left' + }, + { + label: this.tempTtime.getFullYear() + '年' + month + '月', + align: 'center', + children: [] } + ] + for (let d = 1; d <= this.day; d ++) { + arr[3].children.push({ + prop: 'value' + d, label: month + '-' + d + }) + // 横坐标 + this.xData.push(month + '-' + d) + } + this.tableProps = arr + }, + getData() { + this.urlOptions.getDataListURL(this.listQuery).then(res => { + //构造数据 + if (res.data) { + this.setHeader() + res.data.forEach(item => { + console.log('111', item.recordTime, moment(item.recordTime).format('DD')) + this.tableData.push({ + proName: item.proName, + specifications: item.specifications + }) + }) + } + console.log('饿', this.tableData) + // res.data.data.forEach(item => { + // let yData = [] + // lineName.push(item.lineName) + // // let obj = {} + // // obj.lineName = item.lineName, + // // obj.sum = item.sum, + // item.data.forEach((ele, index) => { + // // console.log(ele) + // ele.children.forEach((e) => { + // // let yData = [] + // yData.push(e.dynamicValue) + // }) + // }) + // yAllData.push(yData) + // }); + // console.log(lineName) + // } else { + // this.tableProps = arr + // this.tableData = [] + // xData = [] + // yAllData = [] + // lineName = [] + // } // res.data.data[0].data[0].children.forEach((item, index) => { // // console.log(item) // yData.push(item.dynamicValue) @@ -221,7 +191,7 @@ export default { // // obj['' + item.dynamicName + ''] = item.dynamicValue // }) // console.log(this.yData) - this.$refs.lineChart.initChart(xData, yAllData, lineName) + // this.$refs.lineChart.initChart(this.xData, yAllData, lineName) // this.total = response.data.total; // this.dataListLoading = false; }); @@ -231,23 +201,21 @@ export default { case 'search': // this.listQuery.recordTime = val.time ? new Date(val.time).getTime() : undefined if (val.time) { - const tempTtime = new Date(val.time) - let day = 0 - switch (tempTtime.getMonth() + 1) { + this.tempTtime = new Date(val.time) + switch (this.tempTtime.getMonth() + 1) { case 1, 3, 5, 7, 8, 10, 12: - day = 31; + this.day = 31; break; case 2: - day = 28; + this.day = 28; break; case 4, 6, 9, 11: - day = 30; + this.day = 30; break; } - console.log(parseTime(new Date(tempTtime.getFullYear(), 11, 31, 23, 59, 59))) this.listQuery.recordTime = [ val.time, - parseTime(new Date(tempTtime.getFullYear(), tempTtime.getMonth(), day, 23, 59, 59)) + parseTime(new Date(this.tempTtime.getFullYear(), this.tempTtime.getMonth(), this.day, 23, 59, 59)) ] this.getData() } else { diff --git a/src/views/core/monitoring/auto/index.vue b/src/views/core/monitoring/auto/index.vue index 3f07f50f..6f4e6d5b 100644 --- a/src/views/core/monitoring/auto/index.vue +++ b/src/views/core/monitoring/auto/index.vue @@ -1,7 +1,7 @@ @@ -175,7 +175,7 @@ export default { label: '统计开始时间', dateType: 'datetimerange', format: 'yyyy-MM-dd HH:mm:ss', - valueFormat: "yyyy-MM-ddTHH:mm:ss", + valueFormat: "yyyy-MM-dd HH:mm:ss", rangeSeparator: '-', startPlaceholder: '开始时间', endPlaceholder: '结束时间', diff --git a/src/views/core/monitoring/data24/index.vue b/src/views/core/monitoring/data24/index.vue index 17db36cb..31eb4d0a 100644 --- a/src/views/core/monitoring/data24/index.vue +++ b/src/views/core/monitoring/data24/index.vue @@ -25,6 +25,7 @@ diff --git a/src/views/equipment/analysis/Visualization/SmallTitle.vue b/src/views/equipment/analysis/Visualization/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/equipment/analysis/Visualization/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/equipment/analysis/Visualization/index.vue b/src/views/equipment/analysis/Visualization/index.vue new file mode 100644 index 00000000..9cf0205c --- /dev/null +++ b/src/views/equipment/analysis/Visualization/index.vue @@ -0,0 +1,514 @@ + + + + + + + diff --git a/src/views/equipment/analysis/efficiency/index.vue b/src/views/equipment/analysis/efficiency/index.vue index 66a1e009..5951a847 100644 --- a/src/views/equipment/analysis/efficiency/index.vue +++ b/src/views/equipment/analysis/efficiency/index.vue @@ -13,14 +13,21 @@ ref="search-bar" @headBtnClick="handleSearchBarBtnClick" /> - + + + -
- + --> @@ -132,7 +138,7 @@ export default { width: 128, prop: 'workRate', label: '百分比[%]', - filter: (val) => (val != null ? +val.toFixed(3) : '-'), + filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'), }, ], }, @@ -161,7 +167,7 @@ export default { width: 128, prop: 'timeEfficiency', label: '时间开动率', - filter: (val) => (val != null ? +val.toFixed(3) : '-'), + filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'), }, ], }, @@ -182,19 +188,19 @@ export default { width: 128, prop: 'peEfficiency', label: '速度开动率', - filter: (val) => (val != null ? +val.toFixed(3) : '-'), + filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'), }, ], }, { prop: 'oee', label: 'OEE', - filter: (val) => (val != null ? +val.toFixed(3) : '-'), + filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'), }, { prop: 'teep', label: 'TEEP', - filter: (val) => (val != null ? +val.toFixed(3) : '-'), + filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'), }, // { // _action: 'view-trend', @@ -332,7 +338,7 @@ export default { /** 准备工厂数据 */ async getFactory() { const { code, data } = await this.$axios({ - url: '/base/factory/listAll', + url: '/base/core-factory/listAll', method: 'get', }); if (code == 0) { @@ -348,7 +354,7 @@ export default { /** 准备产线数据 */ async getLine() { const { code, data } = await this.$axios({ - url: '/base/production-line/listAll', + url: '/base/core-production-line/listAll', method: 'get', }); if (code == 0) { diff --git a/src/views/equipment/analysis/exception/index.vue b/src/views/equipment/analysis/exception/index.vue index c3d38562..7d926392 100644 --- a/src/views/equipment/analysis/exception/index.vue +++ b/src/views/equipment/analysis/exception/index.vue @@ -75,7 +75,7 @@ export default { }, ], tableProps: [ - { prop: 'lineName', label: '产线' }, + { prop: 'lineName', label: '产线名称' }, { prop: 'sectionName', label: '工段' }, { prop: 'equipmentName', label: '设备' }, { @@ -136,7 +136,7 @@ export default { methods: { async fillLineOptions() { const { data } = await this.$axios({ - url: '/base/production-line/listAll', + url: '/base/core-production-line/listAll', method: 'get', }); const cfg = this.searchBarFormConfig.find( diff --git a/src/views/equipment/analysis/quality/index.vue b/src/views/equipment/analysis/quality/index.vue index 8b023489..785f7dc1 100644 --- a/src/views/equipment/analysis/quality/index.vue +++ b/src/views/equipment/analysis/quality/index.vue @@ -262,7 +262,7 @@ export default { async fillLineOptions() { const { data } = await this.$axios({ - url: '/base/production-line/listAll', + url: '/base/core-production-line/listAll', method: 'get', }); const cfg = this.searchBarFormConfig.find( @@ -280,7 +280,7 @@ export default { async fillProductOptions() { const { data } = await this.$axios({ - url: '/base/product/listAll', + url: '/base/core-product/listAll', method: 'get', }); const cfg = this.searchBarFormConfig.find( diff --git a/src/views/equipment/base/alarm/Record/SmallTitle.vue b/src/views/equipment/base/alarm/Record/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/equipment/base/alarm/Record/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/equipment/base/alarm/Record/add-or-updata.vue b/src/views/equipment/base/alarm/Record/add-or-updata.vue new file mode 100644 index 00000000..77a5123b --- /dev/null +++ b/src/views/equipment/base/alarm/Record/add-or-updata.vue @@ -0,0 +1,195 @@ + + + + diff --git a/src/views/equipment/base/alarm/Record/index.vue b/src/views/equipment/base/alarm/Record/index.vue new file mode 100644 index 00000000..82e066d7 --- /dev/null +++ b/src/views/equipment/base/alarm/Record/index.vue @@ -0,0 +1,350 @@ + + + diff --git a/src/views/equipment/base/inspection/Record/addRecord.vue b/src/views/equipment/base/inspection/Record/addRecord.vue new file mode 100644 index 00000000..72776630 --- /dev/null +++ b/src/views/equipment/base/inspection/Record/addRecord.vue @@ -0,0 +1,393 @@ + + + + + + + diff --git a/src/views/equipment/base/inspection/Record/attr-add.vue b/src/views/equipment/base/inspection/Record/attr-add.vue new file mode 100644 index 00000000..bef3ae04 --- /dev/null +++ b/src/views/equipment/base/inspection/Record/attr-add.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/src/views/equipment/base/inspection/Record/index.vue b/src/views/equipment/base/inspection/Record/index.vue index ffdc7d24..8e1940d5 100644 --- a/src/views/equipment/base/inspection/Record/index.vue +++ b/src/views/equipment/base/inspection/Record/index.vue @@ -45,24 +45,32 @@ :has-files="true" :rows="rows" /> + + + + diff --git a/src/views/equipment/base/inspection/Settings/add-or-updata.vue b/src/views/equipment/base/inspection/Settings/add-or-updata.vue new file mode 100644 index 00000000..9866674b --- /dev/null +++ b/src/views/equipment/base/inspection/Settings/add-or-updata.vue @@ -0,0 +1,317 @@ + + + + + diff --git a/src/views/equipment/base/inspection/Settings/attr-add.vue b/src/views/equipment/base/inspection/Settings/attr-add.vue new file mode 100644 index 00000000..d80cdb5b --- /dev/null +++ b/src/views/equipment/base/inspection/Settings/attr-add.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/src/views/equipment/base/inspection/Settings/index.vue b/src/views/equipment/base/inspection/Settings/index.vue index bfa00abf..f1abafb2 100644 --- a/src/views/equipment/base/inspection/Settings/index.vue +++ b/src/views/equipment/base/inspection/Settings/index.vue @@ -17,7 +17,7 @@ v-if="tableBtn.length" slot="handleBtn" label="操作" - :width="120" + :width="180" :method-list="tableBtn" @clickBtn="handleTableBtnClick" /> @@ -45,35 +45,49 @@ :has-files="false" :rows="rows" /> + + - diff --git a/src/views/equipment/base/repair/index.vue b/src/views/equipment/base/repair/index.vue index b5ff9f62..e49669ba 100644 --- a/src/views/equipment/base/repair/index.vue +++ b/src/views/equipment/base/repair/index.vue @@ -17,7 +17,7 @@ v-if="tableBtn.length" slot="handleBtn" label="操作" - :width="120" + :width="180" :method-list="tableBtn" @clickBtn="handleTableBtnClick" /> @@ -45,21 +45,27 @@ :has-files="true" :rows="rows" /> + diff --git a/src/views/equipment/base/spareParts/Config/addSparts.vue b/src/views/equipment/base/spareParts/Config/addSparts.vue new file mode 100644 index 00000000..a12c061f --- /dev/null +++ b/src/views/equipment/base/spareParts/Config/addSparts.vue @@ -0,0 +1,315 @@ + + + + + + + diff --git a/src/views/equipment/base/spareParts/Config/attr-add.vue b/src/views/equipment/base/spareParts/Config/attr-add.vue new file mode 100644 index 00000000..bef3ae04 --- /dev/null +++ b/src/views/equipment/base/spareParts/Config/attr-add.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/src/views/equipment/base/spareParts/Config/index.vue b/src/views/equipment/base/spareParts/Config/index.vue index 3701ef0c..571d252e 100644 --- a/src/views/equipment/base/spareParts/Config/index.vue +++ b/src/views/equipment/base/spareParts/Config/index.vue @@ -17,7 +17,7 @@ v-if="tableBtn.length" slot="handleBtn" label="操作" - :width="120" + :width="250" :method-list="tableBtn" @clickBtn="handleTableBtnClick" /> @@ -46,6 +46,10 @@ :has-files="false" :rows="rows" /> + @@ -53,15 +57,18 @@ import moment from 'moment'; import basicPageMixin from '@/mixins/lb/basicPageMixin'; import { publicFormatter } from '@/utils/dict'; +import Editor from '@/components/Editor'; +import addSparts from './addSparts.vue'; const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'); export default { name: 'EquipmentSparePartsConfig', - components: {}, + components: { addSparts }, mixins: [basicPageMixin], data() { return { + addOrUpdateVisible: false, searchBarKeys: ['name', 'equipmentId', 'equipmentIdList'], tableBtn: [ // this.$auth.hasPermi('equipment:spare-parts-config:update') @@ -76,6 +83,18 @@ export default { btnName: '修改', } : undefined, + this.$auth.hasPermi('equipment:spare-parts-config:queryParts') + ? { + type: 'queryParts', + btnName: '查看备件', + } + : undefined, + this.$auth.hasPermi('equipment:spare-parts-config:addParts') + ? { + type: 'addParts', + btnName: '添加备件', + } + : undefined, this.$auth.hasPermi('equipment:spare-parts-config:delete') ? { type: 'delete', @@ -162,18 +181,23 @@ export default { select: true, // TODO: or INPUT instead of SELECT label: '负责人', prop: 'responsible', - url: '/base/core-equipment/listAll', // TODO: 班组 + url: '/base/core-worker/listAll', // TODO: 班组 + valueKey: 'name', bind: { filterable: true, clearable: true, + multiple: true }, }, ], [ { - input: true, label: '描述', prop: 'description', // TODO: 富文本 + subcomponent: Editor, + bind: { + 'min-height': 192 + } }, ], ], @@ -258,6 +282,7 @@ export default { const id = row.id; this.info({ id }).then((response) => { this.form = response.data; + this.form.responsible = this.form.responsible.split(',') this.open = true; this.title = '修改备品备件配置'; }); @@ -268,6 +293,7 @@ export default { if (!valid) { return; } + this.form.responsible = this.form.responsible.join(',') // 修改的提交 if (this.form.id != null) { this.put(this.form).then((response) => { @@ -300,12 +326,15 @@ export default { .catch(() => {}); }, handleDetail({ id }) { - this.reset(); - this.mode = 'detail'; - this.info({ id }).then((response) => { - this.form = response.data; - this.open = true; - this.title = '修改备品备件配置'; + this.addOrUpdateVisible = true + this.$nextTick(() => { + this.$refs.addOrUpdate.init(id, true); + }); + }, + handlAddParts({ id }) { + this.addOrUpdateVisible = true + this.$nextTick(() => { + this.$refs.addOrUpdate.init(id); }); }, /** 导出按钮操作 */ @@ -326,6 +355,23 @@ export default { }) .catch(() => {}); }, + // 处理表格按钮 + handleTableBtnClick({ data, type }) { + switch (type) { + case 'edit': + this.handleUpdate(data); + break; + case 'delete': + this.handleDelete(data); + break; + case 'queryParts': + this.handleDetail(data); + break; + case 'addParts': + this.handlAddParts(data); + break; + } + }, }, }; diff --git a/src/views/equipment/base/spareParts/List/index.vue b/src/views/equipment/base/spareParts/List/index.vue index 39a8204d..f4b02b42 100644 --- a/src/views/equipment/base/spareParts/List/index.vue +++ b/src/views/equipment/base/spareParts/List/index.vue @@ -148,7 +148,7 @@ export default { select: true, label: '供应商', prop: 'supplierId', - url: '/base/core-supplier/listAll', // TODO: 课上关系 + url: '/base/core-supplier/listAll', // TODO: 供应商 bind: { filterable: true, clearable: true, @@ -161,12 +161,13 @@ export default { select: true, label: '物料类型', prop: 'type', - url: '/base/core-equipment/listAll', // TODO: 物料 + options: this.getDictDatas('material_type'), + // url: '/base/core-equipment/listAll', // TODO: 物料 bind: { filterable: true, clearable: true, }, - rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + rules: [{ required: true, message: '物料类型不能为空', trigger: 'blur' }], }, { input: true, diff --git a/src/views/equipment/base/spareParts/Monitor/addSparts.vue b/src/views/equipment/base/spareParts/Monitor/addSparts.vue new file mode 100644 index 00000000..eb3fd801 --- /dev/null +++ b/src/views/equipment/base/spareParts/Monitor/addSparts.vue @@ -0,0 +1,431 @@ + + + + + + + diff --git a/src/views/equipment/base/spareParts/Monitor/attr-add.vue b/src/views/equipment/base/spareParts/Monitor/attr-add.vue new file mode 100644 index 00000000..ba092618 --- /dev/null +++ b/src/views/equipment/base/spareParts/Monitor/attr-add.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/src/views/equipment/base/spareParts/Monitor/index.vue b/src/views/equipment/base/spareParts/Monitor/index.vue index 4d046bc4..1f07fa39 100644 --- a/src/views/equipment/base/spareParts/Monitor/index.vue +++ b/src/views/equipment/base/spareParts/Monitor/index.vue @@ -31,7 +31,7 @@ @pagination="getList" /> - - + --> + + diff --git a/src/views/equipment/timing-diagram/output/index.vue b/src/views/equipment/timing-diagram/output/index.vue index ccf74e5f..0fb10646 100644 --- a/src/views/equipment/timing-diagram/output/index.vue +++ b/src/views/equipment/timing-diagram/output/index.vue @@ -432,7 +432,7 @@ export default { /** 准备产线数据 */ async initProductline() { const { code, data } = await this.$axios({ - url: '/base/production-line/listAll', + url: '/base/core-production-line/listAll', method: 'get', }); if (code == 0) { @@ -448,7 +448,7 @@ export default { /** 准备工段数据 */ async initWorksection() { const { code, data } = await this.$axios({ - url: '/base/workshop-section/listAll', + url: '/base/core-workshop-section/listAll', method: 'get', }); if (code == 0) { @@ -464,7 +464,7 @@ export default { /** 根据产线获取工段 */ async getWorksectionById(lineId) { const { code, data } = await this.$axios({ - url: '/base/workshop-section/listByParentId', + url: '/base/core-workshop-section/listByParentId', method: 'get', params: { id: lineId, diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue index 283e07f4..7a12766d 100644 --- a/src/views/equipment/timing-diagram/status/index.vue +++ b/src/views/equipment/timing-diagram/status/index.vue @@ -239,7 +239,7 @@ export default { /** 准备产线数据 */ async initProductline() { const { code, data } = await this.$axios({ - url: '/base/production-line/listAll', + url: '/base/core-production-line/listAll', method: 'get', }); if (code == 0) { @@ -255,7 +255,7 @@ export default { /** 准备工段数据 */ async initWorksection() { const { code, data } = await this.$axios({ - url: '/base/workshop-section/listAll', + url: '/base/core-workshop-section/listAll', method: 'get', }); if (code == 0) { @@ -276,7 +276,7 @@ export default { switch (param) { case 'lineId': this.$axios({ - url: '/base/workshop-section/listByParentId', + url: '/base/core-workshop-section/listByParentId', method: 'get', params: { id: value, diff --git a/src/views/monitoring/equipmentProcessAmount/index.vue b/src/views/monitoring/equipmentProcessAmount/index.vue index 2294bff4..aceac638 100644 --- a/src/views/monitoring/equipmentProcessAmount/index.vue +++ b/src/views/monitoring/equipmentProcessAmount/index.vue @@ -323,7 +323,7 @@ export default { }, async getTree() { - const { data } = await this.$axios('/base/factory/getTree'); + const { data } = await this.$axios('/base/core-factory/getTree'); this.sidebarContent = data; this.buildTree(data); console.log('tree', this.sidebarContent);