gaoshp
2024-10-22 638f3c0cfbf1ace8847dadf5c7b3215f371e9ba8
update some bug
已修改2个文件
24 ■■■■ 文件已修改
src/views/console/workstation/index.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/processParam/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/workstation/index.vue
@@ -150,8 +150,10 @@
                                                                type="primary" size="small">保存</el-button> -->
                                                            <!-- <el-button text type="primary" size="small"
                                                                @click="editDMP">修改DMP配置</el-button> -->
                                                            <el-button @click="getExport" style="margin-left: 12px" text type="primary" size="small">导出</el-button>
                                                            <el-button @click="editCollection" text type="primary" style="margin-left: 0px;" size="small">数据点编辑</el-button>
                                                            <el-button @click="getExport" style="margin-left: 12px" text
                                                                type="primary" size="small">导出</el-button>
                                                            <el-button @click="editCollection" text type="primary"
                                                                style="margin-left: 0px;" size="small">数据点编辑</el-button>
                                                        </el-header>
                                                        <el-main>
@@ -272,9 +274,17 @@
                            <el-header v-show="!addGroupShow">
                                <div class="left-panel">
                                    <el-button @click="addChild" type="primary" plain>新增下级</el-button>
                                    <el-button @click="deleteWorkGroup"
                                    <el-popconfirm width="220" cancel-button-text="停用" confirm-button-text="删除"
                                        title="删除会将工位组下的工位移动到默认组中,请确认是否删除?" @confirm="deleteWorkGroup"
                                        @cancel="table_del([scope.row], '1')">
                                        <template #reference>
                                            <el-button v-show="!['1', '101'].includes(treeCheckedNode.id)" type="danger"
                                                plain>删除</el-button>
                                        </template>
                                    </el-popconfirm>
                                    <!-- <el-button @click="deleteWorkGroup"
                                        v-show="!['1', '101'].includes(treeCheckedNode.id)" type="danger"
                                        plain>删除</el-button>
                                        plain>删除</el-button> -->
                                </div>
                            </el-header>
                            <el-main class="" v-show="!addGroupShow">
src/views/mdc/processParam/index.vue
@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-09 22:11:21
 * @LastEditors: lzhe lzhe@example.com
 * @LastEditTime: 2024-10-10 11:04:05
 * @LastEditors: gaoshp
 * @LastEditTime: 2024-10-22 22:30:19
 * @FilePath: /cps-web/src/views/mdc/processParam/index.vue
 实时看板
-->
@@ -12,7 +12,7 @@
                <el-aside width="300px" style="height: 100%;">
                    <el-container>
                        <el-main class="nopadding">
                            <el-row style="margin-top: 14px;">
                            <el-row style="margin: 8px;font-size: 14px;">
                                工位
                            </el-row>
                            <MYTree v-model="treeChecked" @loaded="query"></MYTree>