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

lzhe

2024-06-17 9bf28078015a275fa75b2d169fc31623637b492f

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-16 14:58:00
 * @LastEditTime: 2024-06-17 21:55:33
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Shift.vue
-->
<template>
@@ -32,7 +32,7 @@
                </el-table-column>
                <el-table-column prop="" :label="colname">
                    <template #default="scope">
                        <span>{{ (scope.row.data['1'] ? scope.row.data['1'] * 100 : 0).toFixed(2) }}%</span>
                        <span>{{ colnameFn(scope.row.data['1']) }}</span>
                    </template>
                </el-table-column>
                <el-table-column prop="" label="班次2">
@@ -42,7 +42,7 @@
                </el-table-column>
                <el-table-column prop="" :label="colname">
                    <template #default="scope">
                        <span>{{ scope.row.data['2'] }}</span>
                        <span>{{ colnameFn(scope.row.data['2']) }}</span>
                    </template>
                </el-table-column>
            </scTable>
@@ -62,6 +62,13 @@
            default: '',
            type: String,
        },
        colnameFn: {
            type: Function,
            default: val => {
                if (isNaN(val)) return '-'
                return `${(val ? val * 100 : 0).toFixed(2)}%`
            }
        },
        options: {
            default() {
                return {}

 src/views/mdc/components/Time.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-18 21:52:18
 * @LastEditors: Sneed
 * @LastEditTime: 2024-04-27 23:30:06
 * @LastEditTime: 2024-06-17 22:02:38
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Time.vue
-->
<template>
@@ -26,9 +26,9 @@
            <scTable ref="table" row-key="id" border :params="params" :apiObj="apiObj" stripe>
                <el-table-column prop="workstationCode" label="工位编码" />
                <el-table-column prop="workstationName" label="工位名称" />
                <el-table-column prop="" :label="item" v-for="item in cols">
                <el-table-column prop="" :label="item" v-for="item in cols" :key="item">
                    <template #default="scope">
                        <span>{{ scope.row.data[item] }}</span>
                        <span>{{ colnameFn(scope.row.data[item]) }}</span>
                    </template>
                </el-table-column>

@@ -44,6 +44,25 @@
        url: {
            default: '/api/blade-mdc/efficiency-analysis',
            type: String,
        },
        options: {
            default() {
                return {}
            },
        },
        colnameFn: {
            type: Function,
            default: val => {
                if (isNaN(val)) return '-'
                return `${(val ? val * 100 : 0).toFixed(2)}%`
            }
        },
        resFn: {
            type: Function,
            default: val => {
                if (isNaN(val)) return 0
                return (val - 0) * 100
            }
        }
    },
    components: {
@@ -157,7 +176,8 @@
                    dataset: {
                        source: []
                    },
                    series: []
                    series: [],
                    ...this.options
                }
                let source1 = ['product']
                let row = res.data.items.records[0]
@@ -171,7 +191,8 @@
                res.data.items.records.forEach(v => {
                    let current = [v.id]
                    Object.keys(v.nameData).forEach(key => {
                        current.push((v.data[key] - 0) * 100)
                        current.push(this.resFn(v.data[key]))
                        // current.push((v.data[key] - 0) * 100)
                    })
                    option2.dataset.source.push(current)
                });

 src/views/mdc/configComp/Status.vue

@@ -1,13 +1,14 @@
<!--
 * @Date: 2024-04-17 18:53:45
 * @LastEditors: Sneed
 * @LastEditTime: 2024-06-16 14:35:07
 * @LastEditTime: 2024-06-17 22:12:42
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/configComp/Status.vue
-->
<template>
    <el-main>
        <el-row>
            <scFormTable ref="table" size="small" v-model="data" stripe hideAdd hideDelete dragSort @rowDrop="save">
            <!-- dragSort -->
            <scFormTable ref="table" size="small" v-model="data" stripe hideAdd hideDelete @rowDrop="save">
                <el-table-column label="工位/机器状态" prop="name"></el-table-column>
                <el-table-column label="编号" prop="code"></el-table-column>
                <el-table-column label="颜色" prop="color"></el-table-column>
@@ -35,7 +36,8 @@
            </scFormTable>
        </el-row>
        <el-row style="margin-top: 20px;">
            <scFormTable ref="table1" v-model="Tabledata" stripe @delRow="remove" :addTemplate="addTemplate" dragSort>
            <!-- dragSort -->
            <scFormTable ref="table1" v-model="Tabledata" stripe @delRow="remove" :addTemplate="addTemplate">
                <el-table-column label="人工反馈状态" prop="name">
                    <template #default="scope">
                        <el-input v-model="scope.row.name" @change="update(scope.row)"></el-input>

 src/views/mdc/configuration.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-09 22:11:21
 * @LastEditors: Sneed
 * @LastEditTime: 2024-04-18 00:00:27
 * @LastEditTime: 2024-06-17 22:16:39
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/configuration.vue
 * 应用设置
-->
@@ -42,18 +42,19 @@
                                <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"
                                    @click="add(scope.row)">保存</el-button>
                                <el-button v-show="!scope.row.isEdit" @click="edit(scope.row)">编辑</el-button>
                                <el-button v-show="!scope.row.isEdit && scope.row.collectType > 7"
                                    @click="edit(scope.row)">编辑</el-button>
                            </template>
                        </el-table-column>
                    </scFormTable>

 src/views/mdc/efficiency-analysis.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-09 22:11:21
 * @LastEditors: Sneed
 * @LastEditTime: 2024-06-16 15:06:31
 * @LastEditTime: 2024-06-17 21:53:34
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/efficiency-analysis.vue
 * 效率分析
-->
@@ -44,7 +44,7 @@
                                <Shift :options="chartOption" colname="效率" ref="shift" v-if="activeName == 'shift'" />
                            </el-tab-pane>
                            <el-tab-pane label="按时间周期统计" name="time">
                                <Time ref="time" v-if="activeName == 'time'" />
                                <Time :options="chartOption1" ref="time" v-if="activeName == 'time'" />
                            </el-tab-pane>
                        </el-tabs>
                    </el-main>
@@ -80,6 +80,45 @@
            productivityType: 'OEE',
            time: [],
            treeChecked: [],
            chartOption1: {
                title: {
                    text: '统计图表',
                    subtext: '',
                },
                grid: {
                    top: '80px'
                },
                tooltip: {
                    trigger: 'axis'
                },
                tooltip: {
                    trigger: 'axis',
                    valueFormatter: (params) => {
                        return params.toFixed(2) + '%'
                    }
                },
                xAxis: {
                    type: 'category',
                    axisLabel: {
                        interval: 'auto',
                    }
                },
                yAxis: {
                    type: 'value',
                    axisLabel: {
                        formatter: (value) => {
                            return value + '%'
                        }
                    },
                },
                dataZoom: [
                    { type: 'slider' }
                ],
                dataset: {
                    source: []
                },
                series: []
            },
            chartOption: {
                legend: {
                    type: 'plain',

 src/views/mdc/output-statistics.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-09 22:11:21
 * @LastEditors: Sneed
 * @LastEditTime: 2024-06-04 21:23:21
 * @LastEditTime: 2024-06-17 22:01:34
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/output-statistics.vue
 * 效率分析
-->
@@ -34,12 +34,14 @@
                    <el-main>
                        <el-tabs tab-position="top" v-model="activeName" type="card">
                            <el-tab-pane label="按班次统计" name="shift">
                                <Shift :options="chartOption" :datasetNum="1" colname="产量" url="/api/blade-mdc/output"
                                    ref="shift" v-if="activeName == 'shift'">
                                <Shift :options="chartOption" :datasetNum="1" colname="产量"
                                    :colnameFn="val => { return val }" url="/api/blade-mdc/output" ref="shift"
                                    v-if="activeName == 'shift'">
                                </Shift>
                            </el-tab-pane>
                            <el-tab-pane label="按时间周期统计" name="time">
                                <Time url="/api/blade-mdc/output" ref="time" v-if="activeName == 'time'">
                                <Time :resFn="val => val" :options="chartOption1" :colnameFn="val => { return val }"
                                    url="/api/blade-mdc/output" ref="time" v-if="activeName == 'time'">

                                </Time>
                            </el-tab-pane>
@@ -76,6 +78,9 @@
            activeName: 'shift',
            time: [],
            treeChecked: [],
            chartOption1: {

            },
            chartOption: {
                legend: {
                    type: 'plain',