Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front

gaosp

2024-01-16 fcb6eb2c02f00b0da864a8915af2afcb285a63a8

Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front

# Conflicts:
#	src/container/machineList/index.vue

 src/container/ledger/Manage-add-update.vue

@@ -10,7 +10,7 @@
          <el-row :gutter="20">

          <el-col :xs="24":sm="6":md="6":lg="6":xl="6">

            <el-form-item label="机床名" prop="machineName">

              <el-input v-model="dataForm.machineName" placeholder="机床ip" clearable></el-input>

              <el-input v-model="dataForm.machineName" placeholder="机床名称" clearable></el-input>

            </el-form-item>

          </el-col>

          <!-- 

@@ -177,6 +177,7 @@
              </el-select>

            </el-form-item>

          </el-col>

          <!--

          <el-col :xs="24":sm="6":md="6":lg="6":xl="6">

            <el-form-item label="班次" prop="classes">

              <el-select v-model="dataForm.classes" placeholder="---请选择---">

@@ -186,6 +187,7 @@
              </el-select>

            </el-form-item>

          </el-col>

          -->

          <el-col :xs="24":sm="6":md="6":lg="6":xl="6">

            <el-form-item label="生产厂家" prop="manufacturer">

              <el-input v-model="dataForm.manufacturer" placeholder="生产厂家" clearable></el-input>


 src/container/machineList/index.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-16 20:11:37
 * @LastEditTime: 2024-01-16 20:26:19
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/machineList/index.vue
-->
<template>
@@ -34,68 +34,73 @@
                    <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="id"
                    label="机床名称"
                    prop="machineName"
                    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"
                    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"
                    prop="workshop"
                    label="车间"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
                    prop="section"
                    label="工段"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
                    prop="shiftType"
                    label="班制"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
                    label="程序传输模式"
                    prop="port"
                    label="端口"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
                    label="dnc名称"
                    prop="transMode"
                    label="程序传输模式"
                    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> -->
                        <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="dncName"
                    label="DNC名称"
                    width="180">
                </el-table-column>
            </template>
            
        </List>