gaoshp
2024-06-16 8261c004cc4a8351b42c34438a2b4b62c065d991
update
已修改6个文件
41 ■■■■■ 文件已修改
src/views/console/basic-data/material-warehousing-data/Material-warehousing-dataComp.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/workstation/index.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/components/Shift.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/configComp/Status.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/efficiency-analysis.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/basic-data/material-warehousing-data/Material-warehousing-dataComp.vue
@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-05-08 21:29:53
 * @LastEditors: Sneed
 * @LastEditTime: 2024-05-12 13:43:21
 * @LastEditTime: 2024-06-16 14:48:03
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/material-warehousing-data/Material-warehousing-dataComp.vue
-->
<template>
@@ -61,7 +61,7 @@
                </el-table-column>
            </scTable>
        </el-main>
        <el-drawer v-model="drawer" title="物料类型">
        <el-drawer v-model="drawer" :title="form.id ? '编辑' : '新增'">
            <el-form :model="form" :rules="rules" ref="dialogForm" label-width="120px" label-position="center">
                <el-row>
                    <el-col :span="24">
src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-05-08 21:29:53
 * @LastEditors: Sneed
 * @LastEditTime: 2024-05-09 21:12:56
 * @LastEditTime: 2024-06-16 14:41:35
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
-->
<template>
@@ -136,7 +136,7 @@
                    </el-col>
                    <el-col :span="24">
                        <el-form-item label="额定库存" prop="lowerLimit">
                            <el-input-number v-model="form.upperLimit" :precision="2" :step="0.01" :max="10" />
                            <el-input-number v-model="form.lowerLimit" :precision="2" :step="0.01" :max="10" />
                        </el-form-item>
                    </el-col>
                    <el-col :span="24">
src/views/console/workstation/index.vue
@@ -26,12 +26,12 @@
                                <div class="right-panel">
                                    <div class="right-panel-search">
                                        <span>类型</span>
                                        <el-select v-model="type" style="width: 240px">
                                        <el-select v-model="type" style="width: 240px" clearable>
                                            <el-option v-for="item in types" :key="item.value" :label="item.label"
                                                :value="item.value" />
                                        </el-select>
                                        <span>状态</span>
                                        <el-select v-model="statu" style="width: 240px">
                                        <el-select v-model="statu" style="width: 240px" clearable>
                                            <el-option v-for="item in status" :key="item.value" :label="item.label"
                                                :value="item.value" />
                                        </el-select>
@@ -137,14 +137,17 @@
                                                        </el-header>
                                                        <el-main>
                                                            <el-table :data="list" height="200px">
                                                                <el-table-column label="采集变量名称" prop="name" />
                                                                <el-table-column label="工位变量名称" prop="dataItem">
                                                                <el-table-column label="采集变量名称" prop="name"
                                                                    width="120" />
                                                                <el-table-column label="工位变量名称" prop="dataItem"
                                                                    width="120">
                                                                    <template #default="scope">
                                                                        <el-input :disabled="!editFlag"
                                                                            v-model="scope.row.dataItem"></el-input>
                                                                    </template>
                                                                </el-table-column>
                                                                <el-table-column label="数据标签" prop="description">
                                                                <el-table-column label="数据标签" prop="description"
                                                                    width="150">
                                                                    <template #default="scope">
                                                                        <el-select :disabled="!editFlag"
                                                                            v-model="scope.row.description">
@@ -157,7 +160,8 @@
                                                                        <!-- {{ dmp_data_type.find(v => v.dictKey == scope.row.wcsDataType)?.dictValue }} -->
                                                                    </template>
                                                                </el-table-column>
                                                                <el-table-column label="数据类别" prop="wcsDataType">
                                                                <el-table-column label="数据类别" prop="wcsDataType"
                                                                    width="150">
                                                                    <template #default="scope">
                                                                        <el-select disabled
                                                                            v-model="scope.row.wcsDataType">
src/views/mdc/components/Shift.vue
@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-18 21:52:18
 * @LastEditors: Sneed
 * @LastEditTime: 2024-06-04 21:40:52
 * @LastEditTime: 2024-06-16 14:58:00
 * @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'] }}</span>
                        <span>{{ (scope.row.data['1'] ? scope.row.data['1'] * 100 : 0).toFixed(2) }}%</span>
                    </template>
                </el-table-column>
                <el-table-column prop="" label="班次2">
src/views/mdc/configComp/Status.vue
@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-17 18:53:45
 * @LastEditors: Sneed
 * @LastEditTime: 2024-04-18 19:42:24
 * @LastEditTime: 2024-06-16 14:35:07
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/configComp/Status.vue
-->
<template>
@@ -207,6 +207,9 @@
            if (!row.code || !row.color || !row.name) {
                return this.$message.warning('状态名称、编号、颜色必填'); (`操作成功`)
            }
            if (isNaN(row.code) || row.code < 1 || row.code > 99) {
                return this.$message.warning('编号范围为1~99');
            }
            let data = {
                code: row.code,
                color: row.color,
src/views/mdc/efficiency-analysis.vue
@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-09 22:11:21
 * @LastEditors: Sneed
 * @LastEditTime: 2024-05-20 21:04:56
 * @LastEditTime: 2024-06-16 15:06:31
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/efficiency-analysis.vue
 * 效率分析
-->
@@ -92,7 +92,11 @@
                    top: '80px'
                },
                tooltip: {
                    trigger: 'axis'
                    trigger: 'axis',
                    valueFormatter: (params) => {
                        console.log(params, '>>>>>>>>.113213')
                        return params.toFixed(2) + '%'
                    }
                },
                xAxis: {
                    type: 'category',