From 00c8943add0753245977bdc4eb3dc7d979cf3f45 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 14 一月 2024 17:17:13 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front
---
src/container/Map/Map.vue | 89 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 75 insertions(+), 14 deletions(-)
diff --git a/src/container/Map/Map.vue b/src/container/Map/Map.vue
index 2e0d004..9680251 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-12 22:28:57
+ * @LastEditTime: 2024-01-14 15:07:18
* @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> -->
@@ -37,7 +38,7 @@
: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">
+ <!-- <div v-show="v.id" class="machine">
<p>YKX123123213</p>
<div>
<div class="img">
@@ -67,19 +68,15 @@
</li>
</ul>
</div>
- </div>
-
+ </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>
@@ -93,11 +90,13 @@
}
import mixins from '@/mixins/index'
import AddMachine from './addMachine.vue'
+import Device from '../workshop/device.vue'
import {mapGetters} from 'vuex'
export default {
mixins: [mixins],
components: {
- AddMachine
+ AddMachine,
+ Device
},
props: {
status: {
@@ -112,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() {
@@ -178,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
},
@@ -194,9 +230,8 @@
try {
this.height = (document.querySelector('.table').getBoundingClientRect().height - 30) / 20
} catch (error) {
-
}
-
+ console.log(this.$route.name)
},
beforeUpdate() {
try {
@@ -233,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()
@@ -357,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
@@ -371,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%;
@@ -411,6 +465,11 @@
}
}
+.table.active {
+ // position: relative;
+ // left: 100%;
+ // animation: move 6s infinite alternate;
+}
.table {
// margin-top: 10px;
// display: flex;
@@ -419,6 +478,7 @@
height: 100%;
position: relative;
overflow-x: scroll;
+
.table-action {
position: absolute;
z-index: 999;
@@ -439,6 +499,7 @@
// table-layout: fixed;
// word-wrap: break-word;
overflow: hidden;
+ border-radius: 10px;
// box-sizing: border-box;
td {
// width: 50px;
--
Gitblit v1.9.3