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

gaosp

2024-03-08 a578436d7f0040e0af24add5837cc9cc992766c1

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

 src/container/Map/Map.vue

@@ -427,23 +427,28 @@
        },
        sign(type) {
            //if(type == 2){//2:设备
                console.log('hh',this);
                //console.log('hh',this);
                const { x, x1, y, y1 } = this.range
                
                for (var i = x; i <= x1; i++) {
                    for (var j = y; j <= y1; j++) {
						
                        let arr = [...(this.map[i])]
                        if (type == 2 && (arr[j].colspan < 4 || arr[j].rowspan  <  4)) { //x1-x<3 || y1-y<3
							
                            return this.$message({
                                type: 'error',
                                message: '单元格较小，无法展示设备，请至少合并4行4列单元格'
                            })
							
                        }
                        
                        arr[j].type = type
                        arr[j].id = undefined
                        this.$set(this.map, i, arr)
						
                    }
					
                }
            //}
            this.showAction = false

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

@@ -6,8 +6,8 @@
            <el-form :model="dataForm" label-width="100px" ref="dataForm">

                <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="机床名称" clearable></el-input>

                        <el-form-item label="设备名称" prop="machineName">

                            <el-input v-model="dataForm.machineName" clearable></el-input>

                        </el-form-item>

                    </el-col>

                    <!-- 

@@ -55,7 +55,7 @@
          </el-col> -->

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

                        <el-form-item label="统一编号" prop="uuid">

                            <el-input v-model="dataForm.uuid" placeholder="统一编码" clearable></el-input>

                            <el-input v-model="dataForm.uuid" placeholder="统一编号" clearable></el-input>

                        </el-form-item>

                    </el-col>




 src/container/manufacturer/index.vue

@@ -6,7 +6,7 @@
-->
<template>
    <div class="maintenance">
        <Nav name="生产厂商管理"></Nav>
        <Nav name="生产厂家管理"></Nav>
        <List ref="list" :url="url">
            <template slot="search">
                <div class="item">