Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web

lzhe

2024-06-17 4e89a3613561f6a7fcb22f9609f211fda12905f0

Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web

 src/views/mdc/components/Shift.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-18 21:52:18
 * @LastEditors: Sneed
 * @LastEditTime: 2024-06-17 21:55:33
 * @LastEditTime: 2024-06-17 22:24:22
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Shift.vue
-->
<template>
@@ -147,6 +147,11 @@
                queryType: 0,
                statisticalMethod: this.statisticalMethod
            }
            try {
                this.option2.dataset.source = []
            } catch (error) {

            }
            return this.$HTTP.post(this.url, dataSend, { params }).then(res => {
                this.chartsData = res.data.items.records
                let option2 = {

 src/views/mdc/components/Time.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-18 21:52:18
 * @LastEditors: Sneed
 * @LastEditTime: 2024-06-17 22:02:38
 * @LastEditTime: 2024-06-17 22:37:51
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Time.vue
-->
<template>
@@ -89,7 +89,7 @@
            ],
            cols: [],
            chartsData: [],
            option2: null,
            option2: {},
        }
    },
    watch: {
@@ -140,45 +140,19 @@
                queryType: 0,
                statisticalMethod: this.statisticalMethod
            }
            // console.log(this.option2.series, '>>>>>>>>>>???')
            try {
                this.option2.dataset.source = []
                this.option2.series = []
            } catch (error) {

            }
            return this.$HTTP.post(this.url, dataSend, { params }).then(res => {
                this.chartsData = res.data.items.records
                let option2 = {
                    // legend: {
                    //     type: 'plain',
                    // },
                    title: {
                        text: '统计图表',
                        subtext: '',
                    },
                    grid: {
                        top: '80px'
                    },
                    tooltip: {
                        trigger: 'axis'
                    },
                    xAxis: {
                        type: 'category',
                        axisLabel: {
                            interval: 'auto',
                        }
                    },
                    yAxis: {
                        type: 'value',
                        axisLabel: {
                            formatter: (value) => {
                                return value + '%'
                            }
                        },
                    },
                    dataZoom: [
                        { type: 'slider' }
                    ],
                    dataset: {
                        source: []
                    },
                    series: [],
                    ...this.options
                }
                option2.series = []
                let source1 = ['product']
                let row = res.data.items.records[0]
                Object.values(row.nameData).forEach(v => {
@@ -187,6 +161,7 @@
                    })
                    source1.push(v)
                })

                option2.dataset.source = [source1]
                res.data.items.records.forEach(v => {
                    let current = [v.id]

 src/views/mdc/configuration.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-09 22:11:21
 * @LastEditors: Sneed
 * @LastEditTime: 2024-06-17 22:16:39
 * @LastEditTime: 2024-06-17 22:25:23
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/configuration.vue
 * 应用设置
-->
@@ -42,13 +42,13 @@
                                <span v-else>{{ scope.row.dataTypeDesc }}</span>
                            </template>
                        </el-table-column>
                        <!-- <el-table-column label="脉冲计数倍率" prop="value">
                        <el-table-column label="脉冲计数倍率" prop="value">
                            <template #default="scope">
                                <el-input-number v-if="scope.row.isEdit && scope.row.collectType == 9" :min="1"
                                    :max="10" />
                                <span>{{ scope?.row?.parameter?.value }}</span>
                            </template>
                        </el-table-column> -->
                        </el-table-column>
                        <el-table-column label="操作" prop="state">
                            <template #default="scope">
                                <el-button v-show="!scope.row.id || scope.row.isEdit"

 src/views/mdc/efficiency-analysis.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-09 22:11:21
 * @LastEditors: Sneed
 * @LastEditTime: 2024-06-17 21:53:34
 * @LastEditTime: 2024-06-17 22:29:44
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/efficiency-analysis.vue
 * 效率分析
-->
@@ -156,12 +156,14 @@
                        ['product', '班次1', '班次2'],
                    ]
                },
                series: [{
                    type: 'bar',
                },
                {
                    type: 'bar',
                }]
                series: [
                    {
                        type: 'bar',
                    },
                    {
                        type: 'bar',
                    }
                ]
            },
            options: [
                {