From 4d18d6d118e265cb131c1ece7a0f0ab0a2db4ce7 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 14 一月 2024 20:16:35 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front
---
src/container/Map/Map.vue | 84 +++++++++++++++++++++++++++++++++++------
1 files changed, 71 insertions(+), 13 deletions(-)
diff --git a/src/container/Map/Map.vue b/src/container/Map/Map.vue
index eac3ee5..92cc7a4 100644
--- a/src/container/Map/Map.vue
+++ b/src/container/Map/Map.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-01-05 23:47:53
* @LastEditors: Sneed
- * @LastEditTime: 2024-01-13 23:22:52
+ * @LastEditTime: 2024-01-14 16:50:48
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/Map/Map.vue
-->
<template>
@@ -16,13 +16,14 @@
<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" >
+ <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> -->
@@ -70,16 +71,12 @@
</div> -->
<Device v-if="v.id" :id="v.id" style="width: 100%;height: 100%;"></Device>
</td>
- <!-- <td></td> -->
</tr>
- <!-- <tr>
- <td></td>
- </tr> -->
</table>
</div>
</div>
</div>
- <addMachine :id="id" @setmachineId="setmachineId" v-else @close="close"/>
+ <addMachine :id="id" :machineid="machineid" @setmachineId="setmachineId" v-else @close="close"/>
</div>
</template>
@@ -114,6 +111,34 @@
},
id: {
type: [Number,String]
+ }
+ },
+ computed: {
+ showEdit() {
+ try {
+ const { x, x1, y, y1 } = this.range
+ if (this.range && x && x1 && y && y1) {
+ let start = this.map[x][y]
+ return this.map[x][y].id && (start.rowIndex + start.rowspan -1) === x1 && (start.colIndex + start.colspan -1) === y1
+ }
+ } catch (error) {
+ return false
+ }
+ },
+ machineid () {
+ try {
+ const { x, x1, y, y1 } = this.range
+ if (this.range && x && x1 && y && y1) {
+ let start = this.map[x][y]
+ if (this.map[x][y].id && (start.rowIndex + start.rowspan -1) === x1 && (start.colIndex + start.colspan -1) === y1) {
+ return start.id
+ } else {
+ return ''
+ }
+ }
+ } catch (error) {
+ return ''
+ }
}
},
data() {
@@ -180,6 +205,15 @@
if (this.currentMap.length > 0) this.map = this.currentMap
this.rows = this.currentMap.length;
this.cols = this.currentMap[0].length;
+ if (this.$route.name === 'preview') {
+ this.$nextTick(() => {
+ let {width} = document.querySelector('.table div').getBoundingClientRect()
+ console.log(document.querySelector('.table div').getBoundingClientRect())
+ // document.querySelector('.table').scrollLeft
+ // document.querySelector('.table').scrollTo({left: })
+ })
+ }
+
},
immediate: true
},
@@ -196,9 +230,8 @@
try {
this.height = (document.querySelector('.table').getBoundingClientRect().height - 30) / 20
} catch (error) {
-
}
-
+ console.log(this.$route.name)
},
beforeUpdate() {
try {
@@ -235,7 +268,8 @@
},
contextmenu(e) {
console.log(e)
- if(this.status ===2) return
+ if(this.status ===2) return
+ if (!this.range.x) return
// if (this.range.x !=='') return
e.preventDefault()
e.stopPropagation()
@@ -245,12 +279,12 @@
if (window.innerWidth - left < 100) {
this.position = {
right: 0,
- top: top - t + 10 + 'px'
+ top: top + 10 + 'px'
}
} else {
this.position = {
left: left + 'px',
- top: top -t + 10 + 'px'
+ top: top + 10 + 'px'
}
}
@@ -359,6 +393,11 @@
close () {
this.addStatus = false
},
+ edit (e) {
+ if(this.status ===2) return
+ e.stopPropagation()
+ this.addStatus = true
+ },
setmachineId (id) {
console.log(id)
if (!id) return
@@ -373,6 +412,19 @@
}
</script>
<style lang="scss" scoped>
+
+@keyframes move {
+ 0% {
+ // left: 100%;
+ // transform: translate(0,0);
+ // scrollTop: 0
+ }
+ 100% {
+ // left: 100%;
+ // transform: translate(-100%,0);
+ // scrollTop: 100%
+ }
+}
.map {
width: 100%;
height: 100%;
@@ -413,6 +465,11 @@
}
}
+.table.active {
+ // position: relative;
+ // left: 100%;
+ // animation: move 6s infinite alternate;
+}
.table {
// margin-top: 10px;
// display: flex;
@@ -421,8 +478,9 @@
height: 100%;
position: relative;
overflow-x: scroll;
+
.table-action {
- position: absolute;
+ position: fixed;
z-index: 999;
color: #fff;
width: 100px;
--
Gitblit v1.9.3