From baef0375875c22f7803aa41a28c7f569e055a798 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 22 十一月 2024 18:05:35 +0800
Subject: [PATCH] add： 区域配置
---
src/views/screen1/itm.vue | 4 +-
src/views/screen1/itm-map-plant-board.vue | 2 +
src/components/add-area-item.vue | 94 ++++++++++++++++++++++++++++++++++-------------
3 files changed, 72 insertions(+), 28 deletions(-)
diff --git a/src/components/add-area-item.vue b/src/components/add-area-item.vue
index e579647..730f099 100644
--- a/src/components/add-area-item.vue
+++ b/src/components/add-area-item.vue
@@ -17,13 +17,13 @@
</div>
<div class="flex m-t-2rem">
<div class="label require">布局数量:</div>
- <el-input v-model="areaConfigNum"></el-input>
+ <el-input-number size="medium" v-model="areaConfigNum" :min="500" label="最小是500"></el-input-number>
</div>
<div class="flex m-t-2rem">
<div class="label require">首页背景:</div>
- <el-upload
+ <el-upload v-if="open"
class="upload-demo"
- action="http://localhost:44311/home/UploadFile"
+ :action="getUploadAction()"
:before-upload="beforeUpload"
:on-preview="handlePreview"
:on-remove="handleRemove"
@@ -39,9 +39,9 @@
</div>
<div class="flex m-t-2rem">
<div class="label require">区域背景:</div>
- <el-upload
+ <el-upload v-if="open"
class="upload-demo"
- action="http://localhost:44311/home/UploadFile"
+ :action="getUploadAction()"
:before-upload="beforeUpload"
:on-preview="handlePreview"
:on-remove="handleRemove"
@@ -58,7 +58,7 @@
<div class="m-t-2rem flex">
<div style="text-align: center;" class="flex">
<div class="equ-form-add-button-confirm" @click="submit">确认</div>
- <div class="equ-form-add-button-cancel" @click="open = false">取消</div>
+ <div class="equ-form-add-button-cancel" @click="cancel">取消</div>
</div>
</div>
@@ -68,7 +68,8 @@
</template>
<script>
-import {addAreaItemInfo} from "@/api/addareaitem";
+import {addAreaItemInfo, updateAreaModuleItem} from "@/api/addareaitem";
+import service from '@/utils/request-api'
export default {
props: {
@@ -94,31 +95,64 @@
mounted() {
},
methods: {
- async submit() {
-
- if (!this.uploadUrl || !this.areaBackGroudURL || !this.areacode || !this.areaConfigNum || !this.areacode) {
- this.$message.warning("数据未填写完整");
- return;
- }
- await this.$modal.confirm("确定新增区域吗?");
+ async submit() {
+ if (!this.uploadUrl || !this.areaBackGroudURL || !this.areacode || !this.areaConfigNum || !this.areacode) {
+ this.$message.warning("数据未填写完整");
+ return;
+ }
+ if (this.editItemId != null && this.editItemId != '') {
+ await this.$modal.confirm("确定要编辑区域吗?");
var dto = {
- xVal: this.menuPositionx,
- yVal: this.menuPositiony,
+ id: this.editItemId,
uRL: this.uploadUrl,
areaBackGroudURL: this.areaBackGroudURL,
- areaConfigNum : this.areaConfigNum,
+ areaConfigNum: this.areaConfigNum,
areacode: this.areacode,
tVal: this.areaName,
- moduleName : this.filename1,
- areaBackGroudName : this.filename2,
+ moduleName: this.filename1,
+ areaBackGroudName: this.filename2,
};
- const re = await addAreaItemInfo(dto);
+ const re = await updateAreaModuleItem(dto);
if (re.isSuccess) {
this.$emit('update-area-list'); // 触发自定义事件
- this.$message.success("创建成功");
- this.open = false;
+ this.editItemId = '';
+ this.$message.success("编辑成功");
+ //this.open = false;
+ this.cancel();
}
- },
+ } else {
+ await this.$modal.confirm("确定新增区域吗?");
+ var dto = {
+ xVal: this.menuPositionx,
+ yVal: this.menuPositiony,
+ uRL: this.uploadUrl,
+ areaBackGroudURL: this.areaBackGroudURL,
+ areaConfigNum: this.areaConfigNum,
+ areacode: this.areacode,
+ tVal: this.areaName,
+ moduleName: this.filename1,
+ areaBackGroudName: this.filename2,
+ };
+ const re = await addAreaItemInfo(dto);
+ if (re.isSuccess) {
+ this.$emit('update-area-list'); // 触发自定义事件
+ this.$message.success("创建成功");
+ //this.open = false;
+ this.cancel();
+ }
+ }
+ },
+ async cancel() {
+ this.editItemId = '';
+ this.areacode = '';
+ this.areaName = '';
+ this.areaConfigNum = '';
+ this.fileList[0] = [];
+ this.fileList2[0] = [];
+ this.uploadUrl = '';
+ this.areaBackGroudURL = '';
+ this.open = false;
+ },
openConfig() {
this.open = !this.open;
},
@@ -136,9 +170,11 @@
name : editItem.areaBackGroudName,
}
this.fileList[0] = fileInfo1;
- this.fileList2[0].name = fileInfo2;
-
- console.log( " this.fileList",this.fileList)
+ this.fileList2[0] = fileInfo2;
+ console.log("this.fileList[0]",this.fileList[0])
+ console.log("this.fileList2[0]",this.fileList2[0])
+ this.uploadUrl = editItem.imgSrc;
+ this.areaBackGroudURL = editItem.areaBackGroudURL;
},
handleRemove(file, fileList) {
console.log(file, fileList);
@@ -159,6 +195,11 @@
async beforeUpload(file) {
return true;
},
+ getUploadAction(){
+ this.baseURL = service.defaults.baseURL;
+ console.log("this.baseURL", this.baseURL)
+ return this.baseURL+"home/UploadFile";
+ },
handleSuccess(response, file, fileList) {
// 在这里处理文件上传成功的逻辑，例如保存响应数据到组件的状态中。
this.$message.success('文件上传成功');
@@ -166,6 +207,7 @@
this.uploadUrl = response.result;
this.filename1 = file.name;
console.log('文件上传成功地址', this.uploadUrl);
+ console.log('file.name', this.filename1);
},
handleError(err, file, fileList) {
// 在这里处理文件上传失败的逻辑，例如显示错误消息。
diff --git a/src/views/screen1/itm-map-plant-board.vue b/src/views/screen1/itm-map-plant-board.vue
index b02feee..79b52bb 100644
--- a/src/views/screen1/itm-map-plant-board.vue
+++ b/src/views/screen1/itm-map-plant-board.vue
@@ -259,6 +259,7 @@
itemParam.x = this.x
itemParam.y = this.y
var dto = {
+ areacode : itemParam.areacode,
xVal: itemParam.x,
yVal: itemParam.y,
id: itemParam.id
@@ -280,6 +281,7 @@
itemParam.w = this.width
itemParam.h = this.height
var dto = {
+ areacode : itemParam.areacode,
wVal: itemParam.w,
hVal: itemParam.h,
id: itemParam.id
diff --git a/src/views/screen1/itm.vue b/src/views/screen1/itm.vue
index 895ef4e..d141d4d 100644
--- a/src/views/screen1/itm.vue
+++ b/src/views/screen1/itm.vue
@@ -48,7 +48,7 @@
<span class="div2">个</span>
</div>
<div class="reg-desc">
- Online
+ 从无到有
</div>
</div>
<div class="flex1 reg-img-service">
@@ -58,7 +58,7 @@
<span class="div2">个</span>
</div>
<div class="reg-desc">
- Offline
+ 从有到无
</div>
</div>
</div>
--
Gitblit v1.9.3