gaosp
2024-01-16 07907a65daef5f8b624a8b081eebe6fbc1abcbb5
update
已删除1个文件
已添加1个文件
已修改2个文件
已重命名1个文件
410 ■■■■■ 文件已修改
src/container/devicemaintenance/index.vue 167 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/container/home/index.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/container/machineList/Manage-add-update.vue 补丁 | 查看 | 原始文档 | blame | 历史
src/container/machineList/index.vue 226 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/container/devicemaintenance/index.vue
ÎļþÒÑɾ³ý
src/container/home/index.vue
@@ -99,7 +99,8 @@
                    id: 6,
                    children: [
                        {
                            label:  '报表生成1'
                            label:  '设计器',
                            href: '/mdc/ureport/designer'
                        },
                        {
                            label:  '报表生成1'
@@ -134,8 +135,8 @@
                            pathName: 'deviceType'
                        },
                        {
                            label: '机床维护',
                            pathName: 'devicemaintenance'
                            label: '机床采集',
                            pathName: 'machineList'
                        }
                    ]
                },
@@ -165,8 +166,10 @@
                if(item.pathName) {
                    this.$router.push({name: item.pathName,params: item.params,query: item.query})
                }
            } else {//二级菜单
            } else if(item.pathName){//二级菜单
                this.$router.push({name: item.pathName,params: item.params,query: item.query})
            } else if(item.href) {
                window.open(item.href)
            }
        },
    },
src/container/machineList/Manage-add-update.vue
src/container/machineList/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,226 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-16 20:11:37
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/machineList/index.vue
-->
<template>
    <div class="maintenance">
        <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>
                </div>
                <div class="item">
                    <span>ip地址</span>
                    <el-input class="item-value" v-model="queryInfo.name"></el-input>
                </div>
                <div class="item">
                    <span>型号</span>
                    <el-input class="item-value" v-model="queryInfo.name"></el-input>
                </div>
                <div class="item">
                    <span>程序传输模式</span>
                    <el-input class="item-value" v-model="queryInfo.name"></el-input>
                </div>
                <div class="item">
                    <span>加工类型</span>
                    <el-input class="item-value" v-model="queryInfo.name"></el-input>
                </div>
                <div class="item" style="flex: 1 1 auto;justify-content: center;">
                    <el-button type="primary" size="small" @click="reset">查询</el-button>
                    <el-button type="primary" size="small" @click="reset">重置</el-button>
                </div>
            </template>
            <!-- <template slot="table-tool">
                <el-button type="primary" size="mini" @click="add">添加设备类型</el-button>
            </template> -->
            <template slot="columns">
                <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"
                    label="型号"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
                    label="ip地址"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
                    label="端口"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
                    label="车间"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
                    label="工段"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
                    label="班制"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
                    label="程序传输模式"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
                    label="dnc名称"
                    width="180">
                </el-table-column>
                <el-table-column align="center" label="操作" prop="editor">
                    <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> -->
                    </template>
                </el-table-column>
            </template>
        </List>
        <manage-add-update v-if="addOrUpdateVisible" :addVisible="addOrUpdateVisible" @close="close" @confirm="confirm"
             :row="row"></manage-add-update>
    </div>
</template>
<script>
    import List from '../list/index.vue'
    import ManageAddUpdate from './Manage-add-update'
    import { getUrl } from '@/api/Api'
    export default {
        components: {
            List,
            ManageAddUpdate
        },
        data () {
            return {
                url: '',
                queryInfo: {
                    name: ''
                },
                row: {},
                addOrUpdateVisible: false
            }
        },
        created () {
            this.url = getUrl('machineQuery')
        },
        methods: {
            reset () {
                Object.keys(this.queryInfo).forEach(key => {
                    this.queryInfo[key] = ''
                })
            },
            query () {
                this.$refs.list.pageQuery(this.queryInfo)
            },
            add() {
                this.row = {id:''}
                this.addOrUpdateVisible = true
            },
            close() {
                this.addOrUpdateVisible = false
            },
            confirm() {
                this.query()
                this.close()
            },
            addOrUpdateHandle(row) {
                this.row = row
                this.addOrUpdateVisible = true
            }
        },
    }
</script>
<style lang="scss">
.maintenance {
    .item-value {
        .el-input__inner {
            background: transparent;
            border-radius: 2px;
            border: 1px solid #435F9E;
        }
    }
    .el-button--mini {
        background: transparent;
    }
    .el-button--primary {
        background-color: transparent;
    }
}
</style>
<style lang="scss" scoped>
.maintenance {
    width: 100%;
    height: 100%;
    overflow: hidden;
    color: #FFF;
    display: flex;
    flex-direction: column;
    .nav {
        padding: 10px 30px;
    }
    .item {
        margin-top: 20px;
        margin-left: 50px;
        display: flex;
        align-items: center;
        span {
            width: 120px;
            font-size: 16px;
            font-family: PingFangSC, PingFang SC;
            color: #C6DCE0;
            text-align: right;
            padding-right: 20px;
        }
        .item-value {
            width: 200px;
            border: 1px solid #435F9E;
        }
        .btn {
            line-height: 1.5;
            width: 100px;
            text-align: center;
            font-size: 16px;
            cursor: pointer;
        }
        .reset {
            background: #AAB6BA;
            color: #FFF;
        }
        .query {
            background: #5DD1FC;
            color: #FFF;
        }
    }
}
</style>
src/router/index.js
@@ -74,9 +74,9 @@
        component: () => import('@/container/deviceType/index')
      },
      {
        path: 'devicemaintenance',
        name: 'devicemaintenance',
        component: () => import('@/container/devicemaintenance/index')
        path: 'machineList',
        name: 'machineList',
        component: () => import('@/container/machineList/index')
      },
      {
        path: 'preview',