Merge branch 'releaseProcess' into release

gaoshp

2024-10-30 dbaf14545b430ae46fe0c989ce62238815596a03

 src/views/mdc/processParam/index.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-09 22:11:21
 * @LastEditors: gaoshp
 * @LastEditTime: 2024-10-22 22:30:19
 * @LastEditTime: 2024-10-28 19:51:45
 * @FilePath: /cps-web/src/views/mdc/processParam/index.vue
 实时看板
-->
@@ -37,7 +37,7 @@
                        </el-row>
                        <TimeLine v-model="timeRange" ref="timeLine"></TimeLine>
                        <el-collapse v-model="activeList">
                            <el-collapse-item :title="item.description" :name="index" v-for="(item, index) in list"
                            <el-collapse-item :title="item.deLabel" :name="index" v-for="(item, index) in list"
                                :key="index">
                                <div
                                    v-if="(['DeviceStatus', 'ProcessProgram'].includes(item.name) && item?.dayCharts?.series?.length > 1) || (!['DeviceStatus', 'ProcessProgram'].includes(item.name) && item?.dayCharts?.series?.length > 0) && activeList.indexOf(index) > -1">
@@ -179,16 +179,7 @@
            })
        },
        viewData(item) {
            let data = {
                FeedOverride: '进给倍率',
                FeedSpeed: '进给速度',
                SpindleOverride: '主轴倍率',
                SpindleSpeed: '主轴转速',
                Output: '产量',
                ProcessProgram: '程序名',
                DeviceStatus: '设备状态',
            }
            this.drawerName = data[item.name]
            this.drawerName = item.dpLabel

            this.$HTTP.post('/api/blade-mdc/process-parameter/item?current=1&size=1500', {
                endTime: this.timeRange.endTime,
@@ -226,12 +217,14 @@
                workstationId: this.treeChecked.toString()
            })
            this.list = []
            this.$HTTP.get('/api/blade-mdc/process-parameter/param', { workstationId: this.treeChecked.toString() }).then(res => {
            this.$HTTP.get('/api/blade-mdc/process-parameter/params', { workstationId: this.treeChecked.toString() }).then(res => {
                if (res.code === 200) {
                    console.log('jkjkjkjkj', this.list)
                    this.list = res.data.map(v => {
                        let name = v.isProcessParam ? 'ProcessProgram' : v.dpName
                        return {
                            ...v,
                            name: name,
                            height: ['ProcessProgram', 'DeviceStatus'].includes(v.name) ? '100px' : '200px'
                        }
                    })
@@ -245,28 +238,35 @@
            })
        },
        queryChart1(item) {
            let index = this.list.findIndex(item => item.name === 'DeviceStatus')
            let index = this.list.findIndex(item => item.dpName === 'DeviceStatus')
            this.list[index] = Object.assign({
                ...this.list[index],
                dayCharts: {}
            })
            let params = { ...item }
            try {
                delete params.name
                delete params.height
            } catch (err) { console.error(err) }
            this.$HTTP.post('/api/blade-mdc/process-parameter/chart/dmp-item', {
                methodEnum: "HOUR",
                startTime: this.timeRange.startTime,
                endTime: this.timeRange.endTime,
                workstationId: this.treeChecked.toString(),
                workstationName: '',
                dmpDTO: {
                dpDTO: {
                    id: this.treeChecked.toString(),
                    dmpDeviced: item.dmpDeviceId,
                    name: item.name,
                    description: item.description,
                    dataType: item.dataType,
                    wcsDataType: item.wcsDataType,
                    processParameter: item.processParameter
                    // name: item.name,
                    ...params
                    // dmpDeviced: item.dmpDeviceId,
                    // description: item.description,
                    // dataType: item.dataType,
                    // wcsDataType: item.wcsDataType,
                    // processParameter: item.processParameter
                }
            }).then(res => {
                if (['DeviceStatus', 'ProcessProgram'].includes(item.name)) {
                // if (['DeviceStatus', 'ProcessProgram'].includes(item.name)) {
                if (item.paramChartType === 'distribute') {
                    this.setDeviceStatusOptions(res.data, item.name)
                } else {
                    this.setLineOptions(res.data.data, item.name)