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

lzhe

2024-06-05 fca972e8f4478dbac7b88b579194a76b1c5c49b4

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

 src/views/console/base/CalenderTab.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-04 22:45:43
 * @LastEditors: Sneed
 * @LastEditTime: 2024-05-05 21:20:22
 * @LastEditTime: 2024-06-04 21:07:22
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/base/CalenderTab.vue
-->
<template>
@@ -168,7 +168,7 @@
                                    dates: data.calendarDayVOList.filter(item => {
                                        console.log(moment(item).month(), '>>>123')
                                        return moment(item.calendarDate).month() === i
                                    }),
                                    }).map(v => v.calendarDate),
                                }
                            ]
                        })

 src/views/mdc/MYTree.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-18 19:53:35
 * @LastEditors: Sneed
 * @LastEditTime: 2024-05-26 15:49:11
 * @LastEditTime: 2024-06-04 21:33:08
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/MYTree.vue
-->
<template>
@@ -37,7 +37,7 @@
            defalutProps: {
                label: 'title',
                children: 'children',
                disabled: 'disabled',
                disabled: this.showCheckbox ? '' : 'disabled',
                class: (data, node) => {
                    return this.value.includes(data.id) ? 'active' : ''
                },
@@ -61,13 +61,13 @@
        this.getList()
    },
    methods: {
        renderContent(h, { data,node }) {
        renderContent(h, { data, node }) {
            let img = data.groupTag == 'fms_beltline'
            return h('a', {
                class: {
                    disabled: this.props.disabled ? this.props.disabled(data,node) : data.disabled
                    disabled: this.props.disabled ? this.props.disabled(data, node) : data.disabled
                },
                disabled: this.props.disabled ? this.props.disabled(data,node) : data.disabled
                disabled: this.props.disabled ? this.props.disabled(data, node) : data.disabled
            },
                img ? h('img', {
                    src: pmsPng
@@ -139,9 +139,10 @@
</script>

<style lang="scss">
.active .el-tree-node__content {
.is-current .el-tree-node__content {
    background: var(--el-color-primary) !important;
}

a.disabled {
    color: #ccc;
}

 src/views/mdc/components/Shift.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-18 21:52:18
 * @LastEditors: Sneed
 * @LastEditTime: 2024-05-20 21:05:43
 * @LastEditTime: 2024-06-04 21:40:52
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Shift.vue
-->
<template>
@@ -66,6 +66,10 @@
            default() {
                return {}
            },
        },
        datasetNum: {
            type: Number,
            default: 100
        }
    },
    components: {
@@ -122,7 +126,7 @@
                ...data
            }).then(res => {
                if (res.code === 200) {
                    this.btnList = res.data
                    this.btnList = res.data.reverse()
                    this.btnListActive = res?.data?.[0]?.id
                }
            })
@@ -143,7 +147,7 @@
                }
                option2.dataset.source = [['product', '班次1', '班次2']]
                res.data.items.records.forEach(v => {
                    option2.dataset.source.push([v.workstationName, v.data[1] === '-' ? 0 : v.data[1] * 100, v.data[2] === '-' ? 0 : v.data[2] * 100])
                    option2.dataset.source.push([v.workstationName, v.data[1] === '-' ? 0 : v.data[1] * this.datasetNum, v.data[2] === '-' ? 0 : v.data[2] * this.datasetNum])
                });
                this.option2 = option2
                console.log(option2)

 src/views/mdc/output-statistics.vue

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