update

gaosp

2024-03-03 f22b4ce2acf4223fdcab6c604ce33957ee56d3f6

update

 src/container/Map/Map.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-05 23:47:53
 * @LastEditors: Sneed
 * @LastEditTime: 2024-02-19 19:19:48
 * @LastEditTime: 2024-03-03 10:03:43
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/Map/Map.vue
-->
<template>
@@ -430,6 +430,13 @@
            for (var i = x; i <= x1; i++) {
                for (var j = y; j <= y1; j++) {
                    let arr = [...(this.map[i])]
                    if (arr[j].colspan < 4 || arr[j].rowspan  <  4) {
                        return this.$message({
                            type: 'error',
                            message: '单元格较小，无法展示设备，请至少合并4行4列单元格'
                        })
                    }
                    
                    arr[j].type = type
                    arr[j].id = undefined
                    this.$set(this.map, i, arr)

 src/container/Map/index.vue

@@ -1,16 +1,16 @@
<!--
 * @Date: 2024-01-05 22:26:22
 * @LastEditors: Sneed
 * @LastEditTime: 2024-02-02 23:37:37
 * @LastEditTime: 2024-03-03 09:56:49
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/Map/index.vue
-->
<template>
    <div class="workshop">
        <Nav :name="nav">
            <template>
                <span class="back" @click="back">
                <el-button size="mini" type="" class="back" @click="back">
                    返回
                </span>
                </el-button>
            </template>
        </Nav>
        <Map :id="id" :currentMap="currentMap" @out="out" :name="plantName">

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

@@ -363,8 +363,13 @@
        cancel() {

            this.$emit('close')

        },

        beforeAvatarUpload() {



        beforeAvatarUpload(file) {

            const types  = ['image/jpeg','image/jpg','image/png']

            const isJPG = file.type;

            if (!types.includes(isJPG)) {

            this.$message.error('上传头像图片只能是 JPG、PNG 格式!');

            }

            return types.includes(isJPG);

        },

        handleAvatarSuccess(res) {

            if (res.result === 'SUCCESS') {