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

yangys

2024-03-05 a33533511f0109aaffd6b0c5e31080c20c34a48a

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

 src/container/Map/Map.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-05 23:47:53
 * @LastEditors: Sneed
 * @LastEditTime: 2024-03-03 10:03:43
 * @LastEditTime: 2024-03-05 16:08:05
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/Map/Map.vue
-->
<template>
@@ -433,7 +433,7 @@
                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) { //x1-x<3 || y1-y<3
                        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列单元格'

 src/container/ledger/index.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-29 23:06:26
 * @LastEditTime: 2024-03-05 16:04:32
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/ledger/index.vue
-->
<template>
@@ -53,8 +53,11 @@
                </div>
                <div class="item">
                    <span>投产日期</span>
                    <el-date-picker class="item-value" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
                        v-model="queryInfo.productionDate" type="date" clearable placeholder="选择日期" clearable></el-date-picker>
                    <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="queryInfo.date"
                        range-separator="至" clearable type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" clearable>
                    </el-date-picker>
                    <!-- <el-date-picker class="item-value" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
                        v-model="queryInfo.productionDate" type="date" clearable placeholder="选择日期" clearable></el-date-picker> -->
                </div>
                <div class="item">
                    <span>生产厂家</span>
@@ -196,6 +199,7 @@
            ],
            departmentlist: [],
            queryInfo: {
                date: [],
                uuid: '',
                specification: '',
                type: '',
@@ -203,9 +207,11 @@
                accountingAttribute: '',
                department: '',
                manageType: '',
                productionDate: '',
                // productionDate: '',
                manufacturer: '',
                deviceTypeId: ''
                deviceTypeId: '',
                productionDateBegin: '',
                productionDateEnd: '',
            },
            options: [{}],
            row: {},
@@ -233,12 +239,22 @@
            })
        },
        query() {
            try {
                this.queryInfo.productionDateBegin = this.queryInfo.date[0] || ''
                this.queryInfo.productionDateEnd = this.queryInfo.date[1] || ''
            } catch (error) {
                console.log(error)
            }
            
            this.$refs.list.pageQuery(this.queryInfo)
        },
        reset() {
            Object.keys(this.queryInfo).forEach(key => {
                this.queryInfo[key] = ''
            })
            this.queryInfo.date  = []
            this.queryInfo.productionDateBegin = ''
            this.queryInfo.productionDateEnd = ''
        },
        add() {
            this.row = {}

 src/container/mapPreviewDetail/index.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-05 22:26:22
 * @LastEditors: Sneed
 * @LastEditTime: 2024-02-02 23:46:50
 * @LastEditTime: 2024-03-05 15:39:49
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/mapPreviewDetail/index.vue
-->
<template>
@@ -482,7 +482,8 @@

        .center {
            flex: 1 1 auto;

            display: flex;
            flex-direction: column;
            .center-top {
                display: flex;
                justify-content: space-around;
@@ -527,13 +528,15 @@
            }

            .center-bottom {
                flex: 1 1 auto;
                margin-bottom: 50px;
                margin-top: 50px;
                display: flex;
                justify-content: center;

                img {
                    width: 629px;
                    height: 648px;
                    max-width: 100%;
                    max-height: 100%;
                }
            }
        }