From f8901c0adf0afada9620203eeeebb4fe59e7ce89 Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期二, 16 一月 2024 22:58:34 +0800
Subject: [PATCH] 修改地图
---
src/container/mapPreview/Map.vue | 61 ++----------------------------
1 files changed, 5 insertions(+), 56 deletions(-)
diff --git a/src/container/mapPreview/Map.vue b/src/container/mapPreview/Map.vue
index 92cc7a4..b616262 100644
--- a/src/container/mapPreview/Map.vue
+++ b/src/container/mapPreview/Map.vue
@@ -1,34 +1,13 @@
<!--
* @Date: 2024-01-05 23:47:53
* @LastEditors: Sneed
- * @LastEditTime: 2024-01-14 16:50:48
- * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/Map/Map.vue
+ * @LastEditTime: 2024-01-16 22:37:15
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/mapPreview/Map.vue
-->
<template>
<div class="map">
<div class="map-container" v-if="!addStatus">
- <div class="table-tool" v-if="status !== 2">
- <el-button style="width: 150px;" type="primary" size="mini" @click="save">淇濆瓨</el-button>
- <el-button style="width: 150px;" size="mini" @click="out">閫�鍑�</el-button>
- <el-input v-show="status !==2" v-model="rows" />
- <el-input v-show="status !==2" v-model="cols" />
- <el-button size="mini" v-show="status !==2" @click="createMap">鐢熸垚鍦板浘</el-button>
- <div class="plant-name" v-if="status===2">{{plantName}}</div>
- <el-input class="plant-name" v-if="status!==2" v-model="plantName" placeholder="璇疯緭鍏ュ巶鍚�"/>
- </div>
<div class="table" :class="$route.name ==='preview' ? 'active' : ''" >
- <div class="table-action" :style="position" v-show="showAction && status !== 2">
- <div @click="merge">鍚堝苟</div>
- <div @click="split">鎷嗗垎</div>
- <div @click="sign(1)">杩囬亾</div>
- <div @click="sign(2)">鏈哄簥</div>
- <div @click="sign(0)">鍙栨秷</div>
- <div @click="edit" v-if="showEdit">淇敼鏈哄簥</div>
- <!-- <div>澧炲姞琛�</div> -->
- <!-- <div>鍒犻櫎琛�</div> -->
- <!-- <div>澧炲姞鍒�</div> -->
- <!-- <div>鍒犻櫎鍒�</div> -->
- </div>
<div :style="{width: (cols * height + 'px'),height: rows * height + 'px'}">
<table >
<tr v-for="(item, index) in map" :key="index">
@@ -38,45 +17,15 @@
:class="{'active': (range.x !=='' && v.rowIndex >=range.x && v.rowIndex<=range.x1 && v.colIndex>=range.y && v.colIndex<=range.y1),aisle: v.type ===1}" @mousedown="e => onMousedown(e, v)" @mousemove="e => onMouseMove(e, v)" v-for="v in item"
:rowspan="v.rowspan" :colspan="v.colspan" :key="v.rowIndex + '-' + v.colIndex">
<img @click="addDevice($event,v)" @mousedown="e => e.stopPropagation()" v-if="v.type ===2 && status!==2 && !v.id" src="./img/+.png" alt="">
- <!-- <div v-show="v.id" class="machine">
- <p>YKX123123213</p>
- <div>
- <div class="img">
- <img src="./img/machine.png" alt="">
- </div>
- <ul>
- <li>
- <img src="./img/sd.png" alt="">
- <div>
- <p>0.00%</p>
- <p>鑳藉姏鍒╃敤鐜�</p>
- </div>
- </li>
- <li>
- <img src="./img/sd.png" alt="">
- <div>
- <p>0.00%</p>
- <p>鑳藉姏鍒╃敤鐜�</p>
- </div>
- </li>
- <li>
- <img src="./img/sd.png" alt="">
- <div>
- <p>0.00%</p>
- <p>鑳藉姏鍒╃敤鐜�</p>
- </div>
- </li>
- </ul>
- </div>
- </div> -->
- <Device v-if="v.id" :id="v.id" style="width: 100%;height: 100%;"></Device>
+ <!-- <Device v-if="v.id" :id="v.id" style="width: 100%;height: 100%;"></Device> -->
+ <Device v-if="v.id" :id="v.id" style="width: 100%;height: 100%;" :deviceList="deviceList"
+:plantDeviceList="plantDeviceList" ::info="info"></Device>
</td>
</tr>
</table>
</div>
</div>
</div>
- <addMachine :id="id" :machineid="machineid" @setmachineId="setmachineId" v-else @close="close"/>
</div>
</template>
--
Gitblit v1.9.3