gaosp
2024-01-16 677697e36b35ff80e3b45bb07a0e008fac8e9bd9
update
已修改4个文件
44 ■■■■■ 文件已修改
src/container/component/index.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/container/machineList/Manage-add-update.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/container/machineList/index.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/container/maintenance/index.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/container/component/index.vue
@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-14 15:36:44
 * @LastEditTime: 2024-01-16 23:04:06
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/component/index.vue
-->
<template>
@@ -11,7 +11,7 @@
            <template slot="search">
                <div class="item">
                    <span>零件号</span>
                    <el-select class="item-value" v-model="queryInfo.component" placeholder="请选择">
                    <el-select class="item-value" v-model="queryInfo.component" placeholder="请选择" clearable>
                        <el-option
                        v-for="item in componentList"
                        :key="item"
@@ -23,7 +23,7 @@
                <div class="item">
                    <span>工序号</span>
                    <!-- <el-input class="item-value" v-model="query.no"></el-input> -->
                    <el-select class="item-value" v-model="queryInfo.precess" placeholder="请选择">
                    <el-select class="item-value" v-model="queryInfo.precess" placeholder="请选择" clearable>
                        <el-option
                        v-for="item in precessList"
                        :key="item"
@@ -41,6 +41,7 @@
                        align="right"
                        value-format="yyyy-MM-dd"
                        type="date"
                        clearable
                        placeholder="选择日期">
                    </el-date-picker>
                </div>
@@ -50,6 +51,7 @@
                        class="item-value"
                        v-model="queryInfo.timeEnd"
                        align="right"
                        clearable
                        value-format="yyyy-MM-dd"
                        type="date"
                        placeholder="选择日期">
src/container/machineList/Manage-add-update.vue
@@ -20,7 +20,7 @@
      <!-- 按钮 -->
        <span slot="footer" class="dialog-footer">
        <el-button size="mini" @click="cancel">取消</el-button>
        <el-button size="mini" type="primary" @click="dataFormSubmit()">保存</el-button>
        <el-button size="mini" class="active" type="primary" @click="dataFormSubmit()">保存</el-button>
      </span>
    </el-dialog>
  </div>
src/container/machineList/index.vue
@@ -1,33 +1,33 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-16 22:25:31
 * @LastEditTime: 2024-01-16 23:03:37
 * @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.name" 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.name" 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.name" 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.name" 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.name" clearable></el-input>
                </div>
                <div class="item" style="flex: 1 1 auto;justify-content: flex-end;">
                    <el-button type="primary" size="small" @click="reset">查询</el-button>
@@ -101,6 +101,11 @@
                    label="DNC名称"
                    width="180">
                </el-table-column>
                <el-table-column fixed="right" align="center" label="操作">
                    <template slot-scope="scope">
                        <el-button type="text" size="small" @click="handlerSetting(scope.row)">配置</el-button>
                    </template>
                </el-table-column>
            </template>
            
        </List>
@@ -151,8 +156,7 @@
                this.query()
                this.close()
            },
            addOrUpdateHandle(row) {
                this.row = row
            handlerSetting(row) {
                this.addOrUpdateVisible = true
            }
            
src/container/maintenance/index.vue
@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-16 22:28:00
 * @LastEditTime: 2024-01-16 23:02:37
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/maintenance/index.vue
-->
<template>
@@ -11,11 +11,11 @@
            <template slot="search">
                <div class="item">
                    <span>统一编号</span>
                    <el-input class="item-value" v-model="queryInfo.uuid"></el-input>
                    <el-input class="item-value" v-model="queryInfo.uuid" clearable></el-input>
                </div>
                <div class="item">
                    <span>设备名称</span>
                    <el-select class="item-value" v-model="queryInfo.machineName" placeholder="请选择">
                    <el-select class="item-value" v-model="queryInfo.machineName" placeholder="请选择" clearable>
                        <el-option v-for="item in machineList" :key="item.id" :label="item.machineName" :value="item.id">
                        </el-option>
                    </el-select>
@@ -30,7 +30,7 @@
                </div> -->
                <div class="item">
                    <span>使用部门</span>
                    <el-select class="item-value" v-model="queryInfo.department">
                    <el-select class="item-value" v-model="queryInfo.department" clearable>
                        <el-option v-for="item in departmentlist" :key="item.value" :label="item.label" :value="item.value">
                        </el-option>
                    </el-select>
@@ -41,12 +41,12 @@
                </div> -->
                <div class="item">
                    <span>计划开始日期</span>
                    <el-date-picker class="item-value" v-model="queryInfo.planStartDate" align="right" type="date" placeholder="选择日期">
                    <el-date-picker class="item-value" clearable v-model="queryInfo.planStartDate" align="right" type="date" placeholder="选择日期">
                    </el-date-picker>
                </div>
                <div class="item">
                    <span>计划完成日期</span>
                    <el-date-picker class="item-value" v-model="queryInfo.planFinishDate" align="right" type="date" placeholder="选择日期">
                    <el-date-picker class="item-value" clearable v-model="queryInfo.planFinishDate" align="right" type="date" placeholder="选择日期">
                    </el-date-picker>
                </div>
                <div class="item"  style="flex: 1 1 auto;justify-content: flex-end;">