部分修改词条及其他

gaoshp

2024-11-04 494581ce138323017505adfd215c4ba45ecddcd8

部分修改词条及其他

 src/views/console/workstation/Dialog.vue

@@ -151,7 +151,7 @@
                    <el-button style="margin-left: 50px;margin-top: 8px" @click="addWork">添加工作台</el-button>
                </el-col> -->
                <el-col :span="12">
                    <el-form-item label="数据权限" prop="createDept">
                    <el-form-item label="所属部门" prop="createDept">
                        <el-tree-select :props="{
                            label: 'title',
                            id: 'id',

 src/views/console/workstation/index.vue

@@ -228,13 +228,13 @@
                            <el-main class="" v-show="addGroupShow">
                                <el-form v-show="treeCheckedNode.id == 1" :model="form" :rules="rules" ref="dialogForm"
                                    label-width="200px" label-position="left">
                                    <el-form-item label="产线标签" prop="groupTag">
                                    <!-- <el-form-item label="产线标签" prop="groupTag">
                                        <el-select v-model="form.groupTag" clearable placeholder="产线标签"
                                            style="width: 240px">
                                            <el-option v-for="item in beltline_type" :key="item.dictKey"
                                                :label="item.dictValue" :value="item.dictKey" />
                                        </el-select>
                                    </el-form-item>
                                    </el-form-item> -->
                                    <el-form-item label="产线名称" prop="name">
                                        <el-input style="width: 240px" v-model="form.name" clearable
                                            placeholder="产线名称"></el-input>
@@ -404,7 +404,7 @@
            previewData: {},
            // --------
            form: {
                groupTag: '',
                groupTag: 'beltline',
                name: '',
                sort: '',
                remark: ''

 src/views/tpm/MachineGroup.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-27 20:02:44
 * @LastEditors: gaoshp
 * @LastEditTime: 2024-09-29 19:33:58
 * @LastEditTime: 2024-11-04 20:10:22
 * @FilePath: /cps-web/src/views/tpm/MachineGroup.vue
-->
<template>
@@ -27,7 +27,7 @@
                    <el-form-item label="上级目录" prop="parentName">
                        <el-input disabled style="width: 240px" v-model="form.parentName"></el-input>
                    </el-form-item>
                    <el-form-item label="机器组名称" prop="name">
                    <el-form-item label="设备组名称" prop="name">
                        <el-input :disabled="(form.id === '102' || form.id === '2')" style="width: 240px"
                            v-model="form.name" clearable></el-input>
                    </el-form-item>
@@ -97,7 +97,7 @@
        },
        del() {
            this.$confirm(
                '确认删除该机器组？',
                '确认删除该设备组？',
                {
                    distinguishCancelAndClose: true,
                    confirmButtonText: '删除',

 src/views/tpm/MachineTab.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-27 20:04:34
 * @LastEditors: gaoshp
 * @LastEditTime: 2024-09-24 21:03:08
 * @LastEditTime: 2024-11-04 20:10:30
 * @FilePath: /cps-web/src/views/tpm/MachineTab.vue
-->
<template>
@@ -47,7 +47,7 @@
                    <el-table-column type="selection" width="50"></el-table-column>
                    <el-table-column label="机器编号" prop="machineCode" width="120"></el-table-column>
                    <el-table-column label="机器名称" prop="machineName" width="120"></el-table-column>
                    <el-table-column label="所属机器组" prop="groupName" width="120"></el-table-column>
                    <el-table-column label="所属设备组" prop="groupName" width="120"></el-table-column>
                    <el-table-column label="机器类型" prop="machineTypeName" width="120"></el-table-column>
                    <el-table-column label="机器序列号" prop="serialNo" width="120"></el-table-column>
                    <el-table-column label="短编号" prop="shortCode" width="120"></el-table-column>

 src/views/tpm/machine-management.vue

@@ -2,10 +2,10 @@
    <el-main>
        <el-card shadow="never">
            <el-tabs tab-position="top" class="custom-tabs" v-model="activeName">
                <el-tab-pane label="机器台账" name="1">
                <el-tab-pane label="设备台账" name="1">
                    <Machine></Machine>
                </el-tab-pane>
                <el-tab-pane label="机器组" name="2">
                <el-tab-pane label="设备组" name="2">
                    <MachineGroup></MachineGroup>
                </el-tab-pane>


 src/views/tpm/machine/Dialog.vue

@@ -106,8 +106,8 @@
                    </el-form-item>
                </el-col>
                <el-col :span="8">
                    <el-form-item label="所属机器组" prop="groupId">
                        <!-- <el-input style="width: 240px" v-model="form.groupId" placeholder="所属机器组" clearable></el-input> -->
                    <el-form-item label="所属设备组" prop="groupId">
                        <!-- <el-input style="width: 240px" v-model="form.groupId" placeholder="" clearable></el-input> -->
                        <el-tree-select v-model="form.groupId" node-key="id" :props="props" :data="options.groupId"
                            filterable style="width: 240px" />
                    </el-form-item>
@@ -332,8 +332,8 @@
            },
            mode: "add",
            titleMap: {
                add: '新建机器台账',
                edit: '编辑机器台账',
                add: '新建设备台账',
                edit: '编辑设备台账',
                // show: '查看'
            },
            visible: false,