From a578436d7f0040e0af24add5837cc9cc992766c1 Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期五, 08 三月 2024 08:49:09 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front
---
src/container/ledger/Manage-add-update.vue | 6 +++---
src/container/Map/Map.vue | 7 ++++++-
src/container/manufacturer/index.vue | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/container/Map/Map.vue b/src/container/Map/Map.vue
index 28e70f6..fd0e080 100644
--- a/src/container/Map/Map.vue
+++ b/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
diff --git a/src/container/ledger/Manage-add-update.vue b/src/container/ledger/Manage-add-update.vue
index bd3aed3..5802af9 100644
--- a/src/container/ledger/Manage-add-update.vue
+++ b/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>
diff --git a/src/container/manufacturer/index.vue b/src/container/manufacturer/index.vue
index f8ea8f0..8928b94 100644
--- a/src/container/manufacturer/index.vue
+++ b/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">
--
Gitblit v1.9.3