update some bug

gaoshp

2024-10-22 638f3c0cfbf1ace8847dadf5c7b3215f371e9ba8

 src/views/console/workstation/CollDialog.vue

@@ -1,33 +1,17 @@
<template>
    <el-dialog title="数据点" v-model="visible" :width="'80%'" destroy-on-close @closed="$emit('closed')">
        <p style="margin-bottom: 14px;">
    <el-dialog title="数据点" v-model="visible" :width="'100%'" destroy-on-close @closed="$emit('closed')">
        <p style="margin-bottom: 14px;display: flex;align-items: center;">
            <span style="margin-right: 8px;">类型</span>
            <el-select v-model="type" placeholder="类型" size="small" style="width: 240px" @change="changeType">
                <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
            </el-select>
            <span style="margin-right: 8px;margin-left: auto;">IOT应用ID</span>
            <el-input v-model="appId" placeholder="IOT应用ID" style="width: 240px"></el-input>
        </p>

        <scFormTable v-show="type" ref="table1" v-model="tabledata" stripe hideDelete :hideAdd="!type"
            :addTemplate="addTemplate">
            <el-table-column v-for="item in cols" :key="item.prop" :prop="item.prop" :label="item.label">
                <template #header="scope">
                    <span v-show="item.isRequired" style="color: red;">*</span>
                    <span>{{ scope.column.label }}</span>
                </template>
                <template #default="scope">
                    <el-select v-model="scope.row[item.prop]" placeholder="Select" size="small"
                        v-if="scope.row.status && item.type === 'option'">
                        <el-option v-for="item in item.options" :key="item" :label="item" :value="item" />
                    </el-select>
                    <el-switch size="small" v-model="scope.row[item.prop]"
                        v-else-if="scope.row.status && item.type === 'boolean'" />
                    <el-input size="small" v-model="scope.row[item.prop]" placeholder=""
                        v-else-if="scope.row.status"></el-input>
                    <span v-else>{{ scope.row[item.prop] }}</span>
                </template>
            </el-table-column>

            <el-table-column label="操作" prop="state" width="200">
            <el-table-column label="操作" prop="state" width="200" fixed="left">
                <template #default="scope">
                    <el-button-group>
                        <el-button text type="primary" size="small" @click="table_edit(scope.row)">编辑</el-button>
@@ -41,6 +25,34 @@

                </template>
            </el-table-column>
            <el-table-column width="200" v-for="item in cols" :key="item.prop" :prop="item.prop" :label="item.label">
                <template #header="scope">
                    <span v-show="item.isRequired" style="color: red;">*</span>
                    <span>{{ scope.column.label }}</span>
                    <el-tooltip class="box-item" effect="dark" placement="top-start">
                        <template #content>
                            <p v-html="item.describe"></p>
                        </template>
                        <el-icon v-show="item.describe"><el-icon-question-filled /></el-icon>
                    </el-tooltip>

                </template>
                <template #default="scope">
                    <el-select :disabled="!scope.row.status" v-model="scope.row[item.prop]"
                        @change="change($event, scope.row, scope.$index, item)" placeholder="" size="small"
                        v-if="item.type === 'option'">
                        <el-option v-for="item in item.options" :key="item.value || item" :label="(item?.label || item)"
                            :value="(item.value || item)" />
                    </el-select>
                    <el-switch :disabled="!scope.row.status" size="small" v-model="scope.row[item.prop]"
                        v-else-if="item.type === 'boolean'" />
                    <el-input size="small" v-model="scope.row[item.prop]" placeholder="" v-else-if="scope.row.status"
                        :disabled="(['dpLabel', 'dpName'].includes(item.prop) && 'Other' !== scope.row.dpCategory)"></el-input>
                    <span v-else>{{ scope.row[item.prop] }}</span>
                </template>
            </el-table-column>


        </scFormTable>
        <template #footer>
            <el-button @click="visible = false">取 消</el-button>
@@ -51,6 +63,7 @@

<script>
export default {
    name: 'CollDialog',
    emits: ['success', 'closed'],
    props: {
        option: {
@@ -72,14 +85,25 @@
                status: '2' // 不存在已保存 1: 正在编辑 2: 新增
            },
            type: '',
            typeList: []

            typeList: [],
            appId: ''
        }
    },
    created() {

    },
    methods: {
        change(e, row, index, { prop, options }) {
            console.log(e, options)
            if (prop === 'dpCategory' && e !== 'Other') {
                const label = options.find(v => v.value === e).label
                this.tabledata[index].dpLabel = label
                this.tabledata[index].dpName = e
            } else if (prop === 'dpCategory' && e === 'Other') {
                this.tabledata[index].dpLabel = ''
                this.tabledata[index].dpName = ''
            }
        },
        changeType(val) {
            if (this.tabledata.length > 0) {
                this.$confirm(`切换类型将删除所有已配置数据点`, '提示', {
@@ -87,6 +111,7 @@
                }).then(() => {
                    try {
                        this.cols = JSON.parse(this.typeList.find(v => v.id === val).dpHeadFull)
                        this.addOptions()
                        this.tabledata = []
                    } catch (error) {
                        this.cols = []
@@ -97,12 +122,24 @@
            } else {
                try {
                    this.cols = JSON.parse(this.typeList.find(v => v.id === val).dpHeadFull)
                    this.addOptions()

                } catch (error) {
                    this.cols = []
                }
            }
            console.log('default')
            this.setAddTemp()

        },
        setAddTemp() {
            this.cols.forEach(v => {
                if (v.type === 'boolean') {
                    this.addTemplate[v.prop] = false
                }
                v.default && (this.addTemplate[v.prop] = v.default)

            })
        },
        //显示
        open(mode = 'add', params) {
@@ -125,11 +162,64 @@
            })

        },
        addOptions() {
            if (this.cols.filter(v => v.prop === 'isProcessParam').length === 0) {
                this.cols.unshift(
                    {
                        label: "过程参数",
                        prop: "isProcessParam",
                        isRequired: true,
                        type: 'boolean',
                    }
                )
            }
            if (this.cols.filter(v => v.prop === 'dpLabel').length === 0) {
                this.cols.unshift(
                    {
                        label: "显示名称",
                        prop: "dpLabel",
                        isRequired: true,
                    }
                )
            }
            if (this.cols.filter(v => v.prop === 'dpCategory').length === 0) {
                this.cols.unshift(
                    {
                        label: "点位分类",
                        prop: "dpCategory",
                        isRequired: true,
                        type: 'option',
                        options: [{
                            label: '程序名',
                            value: 'ProgName'
                        }, {
                            label: '程序内容',
                            value: 'ProgContent'
                        }, {
                            label: '刀具号',
                            value: 'ToolNo'
                        }, {
                            label: '状态',
                            value: 'DeviceStatus'
                        }, {
                            label: '产量',
                            value: 'Output'
                        }, {
                            label: '告警',
                            value: 'Alarm'
                        }, {
                            label: '其他',
                            value: 'Other'
                        }]
                    }
                )
            }
        },
        getList(params) {
            this.$HTTP.get(`/api/blade-cps/workstation/listDatapointsByWorkstationId`, {}, { params }).then(res => {
                try {
                    this.cols = JSON.parse(res.data.dpHead)
                    console.log(this.cols, 'cols')
                    this.addOptions()
                } catch (error) {
                    this.cols = []
                }
@@ -142,7 +232,8 @@
                    this.tabledata = []
                }
                this.type = res.data.type

                this.appId = res.data.appId
                this.setAddTemp()
                // return res
            })
        },
@@ -176,16 +267,20 @@
                    return v
                })),
                workstationId: this.params.id,
                type: this.type
                type: this.type,
                appId: this.appId
            }).then(res => {
                if (res.code === 200) {
                    this.getList({
                        workstationId: this.params.id,
                    })
                    this.visible = false
                    this.$emit('success')
                } else {
                    this.$message.error(res.msg)
                }
            }).finally(() => {
                this.visible = false
                this.$emit('success')

            })
        },