update

gaosp

2024-01-16 6d1bb629a56c3274630bb74cf93a855a7c96cbec

 src/container/machineList/index.vue

@@ -1,99 +1,115 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-16 20:11:37
 * @LastEditTime: 2024-01-16 23:53:17
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/machineList/index.vue
-->
<template>
    <div class="maintenance">
        <div class="nav">机床维护</div>
        <div class="nav">机床采集</div>
        <List ref="list" url="/machine/pageQuery">
            <template slot="search">
                <div class="item">
                    <span>机床名称</span>
               <el-input class="item-value" v-model="queryInfo.name"></el-input>
               <el-input class="item-value" v-model="queryInfo.machineName" clearable></el-input>
                </div>
                <div class="item">
                    <span>ip地址</span>
               <el-input class="item-value" v-model="queryInfo.name"></el-input>
               <el-input class="item-value" v-model="queryInfo.ip" clearable></el-input>
                </div>
                <div class="item">
                    <span>型号</span>
               <el-input class="item-value" v-model="queryInfo.name"></el-input>
               <el-input class="item-value" v-model="queryInfo.type" clearable></el-input>
                </div>
                <div class="item">
                    <span>程序传输模式</span>
               <el-input class="item-value" v-model="queryInfo.name"></el-input>
               <el-select class="value" v-model="queryInfo.transMode" placeholder="请选择">
                        <el-option v-for="item in transModeList" :key="item.value" :label="item.label" :value="item.value">
                        </el-option>
                     </el-select>
                </div>
                <div class="item">
                    <span>加工类型</span>
               <el-input class="item-value" v-model="queryInfo.name"></el-input>
               <el-select class="item-value" v-model="queryInfo.category" placeholder="">
                        <el-option v-for="item in deviceType" :key="item.value" :label="item.label" :value="item.value">
                        </el-option>
                    </el-select>
                </div>
                <div class="item" style="flex: 1 1 auto;justify-content: center;">
                    <el-button type="primary" size="small" @click="reset">查询</el-button>
                <div class="item" style="flex: 1 1 auto;justify-content: flex-end;">
                    <el-button type="primary" size="small" @click="query">查询</el-button>
                    <el-button type="primary" size="small" @click="reset">重置</el-button>
                </div>
            </template>
			
         <!-- <template slot="table-tool">
         <!--
         <template slot="table-tool">
                <el-button type="primary" size="mini" @click="add">添加设备类型</el-button>
            </template> -->
			
            </template>
         -->
            <template slot="columns">
				
                <el-table-column
                    prop="machineName"
                    label="名称"
                    width="180">
                </el-table-column>
            <el-table-column
                    prop="id"
                    label="机床名称"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
                    label="加工类型"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
                    prop="type"
                    label="型号"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
                    label="ip地址"
                    prop="category"
                    label="加工类型"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
            <el-table-column
                    prop="ip"
                    label="IP地址"
                    width="180">
                </el-table-column>
            <el-table-column
                    prop="port"
                    label="端口"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
            <el-table-column
                    prop="workshop"
                    label="车间"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
            <el-table-column
                    prop="section"
                    label="工段"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
            <el-table-column
                    prop="shiftType"
                    label="班制"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
            <el-table-column
                    prop="port"
                    label="端口"
                    width="180">
                </el-table-column>
            <el-table-column
                    prop="transMode"
                    label="程序传输模式"
                    width="180">
               <template slot-scope="scope">
                        <span v-if="scope.row.state == 0">com口</span>
                        <span v-else-if="scope.row.state == 1">共享文件夹</span>
                        <span v-else-if="scope.row.state == 3">网口</span>
                    </template>
                </el-table-column>
                <el-table-column
                    prop="name"
                    label="dnc名称"
            <el-table-column
                    prop="dncName"
                    label="DNC名称"
                    width="180">
                </el-table-column>
                <el-table-column align="center" label="操作" prop="editor">
                <el-table-column fixed="right" align="center" label="操作">
                    <template slot-scope="scope">
                        <el-button size="mini" type="text" @click="addDevice(2, scope.row, $event)">配置</el-button>
                        <!-- <el-button size="mini" type="text" @click="deleteHandle(2, scope.row)">删除</el-button> -->
                        <el-button type="text" size="small" @click="handlerSetting(scope.row)">配置</el-button>
                    </template>
                </el-table-column>
            </template>
@@ -114,9 +130,37 @@
        },
        data () {
            return {
                url: '',
                transModeList: [
                    {
                        label: 'com口',
                        value: 0
                    },
                    {
                        label: '享文件夹',
                        value: 1
                    },
                    {
                        label: '网口',
                        value: 2
                    },
                ],
                deviceType: [
                { value: '立加', label: '立加' },
                { value: '卧加', label: '卧加' },
                { value: '立卧转换', label: '立卧转换' },
                { value: '五轴', label: '五轴' },
                { value: '数控车', label: '数控车' },
                { value: '复合加工', label: '复合加工' },
                { value: '数控磨', label: '数控磨' },
                { value: '齿加工', label: '齿加工' },
                { value: '电工加', label: '电工加' }
            ],
                queryInfo: {
                    name: ''
                    category: '',
                    transMode: '',
                    machineName: '',
                    ip: '',
                    type: '',
                },
            row: {},
            addOrUpdateVisible: false
@@ -146,8 +190,8 @@
            this.query()
            this.close()
         },
         addOrUpdateHandle(row) {
            this.row = row
         handlerSetting(row) {
                this.row = row
            this.addOrUpdateVisible = true
         }