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 | 462 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 294 insertions(+), 168 deletions(-)
diff --git a/src/container/Map/Map.vue b/src/container/Map/Map.vue
index 2a44e85..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-06 23:31:26
+ * @LastEditTime: 2024-01-14 15:07:18
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/Map/Map.vue
-->
<template>
@@ -10,97 +10,73 @@
<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 ===0 " v-model="rows" />
- <el-input v-show="status ===0" v-model="cols" />
- <el-button size="mini" v-show="status ===0" @click="createMap">鐢熸垚鍦板浘</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" >
+ <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>
- <table :style="{ width: 20 * cols + 'px', height: 20 * rows + 'px' }">
- <tr v-for="(item, index) in mapNew" :key="index">
- <td v-if="v.rowspan !==0 && v.colspan!==0"
- :style="{
- 'width': v.type ===1 ? '20px' : v.colspan * 20 + 'px!important',
- 'height': v.type ===1 ? '20px' : v.rowspan * 20+ 'px!important'
- }"
- :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" src="./img/+.png" alt="">
- </td>
- <!-- <td></td> -->
- </tr>
- <!-- <tr>
- <td></td>
- </tr> -->
- </table>
+ <div :style="{width: (cols * height + 'px'),height: rows * height + 'px'}">
+ <table >
+ <tr v-for="(item, index) in map" :key="index">
+ <td v-if="v.rowspan !==0 && v.colspan!==0"
+ :width="v.colspan* height + 'px'"
+ :height="v.rowspan* height + 'px'"
+ :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>
+ </td>
+ </tr>
+ </table>
+ </div>
</div>
</div>
- <div class="map-add" v-else>
- <div class="map-add-item">
- <span>缁熶竴缂栧彿</span>
- <el-input class="value"></el-input>
- </div>
- <div class="map-add-item">
- <span>璁惧鍚嶇О</span>
- <el-input class="value"></el-input>
- </div>
- <div class="map-add-item">
- <span>璁惧鍨嬪彿</span>
- <el-input class="value"></el-input>
- </div>
- <div class="map-add-item">
- <span>璁惧瑙勬牸</span>
- <el-input class="value"></el-input>
- </div>
- <div class="map-add-item">
- <span>浣跨敤鍗曚綅</span>
- <el-input class="value"></el-input>
- </div>
- <div class="map-add-item">
- <span>淇濆吇鑰�</span>
- <el-input class="value"></el-input>
- </div>
- <div class="map-add-item">
- <span>淇濆吇鍛ㄦ湡</span>
- <el-input class="value"></el-input>
- </div>
- <div class="map-add-item">
- <span>淇濆吇绫诲瀷</span>
- <el-input class="value"></el-input>
- </div>
- <div class="map-add-item">
- <span>鏄惁鍚堟牸</span>
- <el-input class="value"></el-input>
- </div>
- <div class="map-add-item">
- <span>璁″垝寮�濮嬫椂闂�</span>
- <el-input class="value"></el-input>
- </div>
- <div class="map-add-item">
- <span>璁″垝瀹屾垚鏃堕棿</span>
- <el-input class="value"></el-input>
- </div>
- <div class="map-add-item">
- <span>淇濆吇鍐呭涓庡瓨鍦ㄩ棶棰�</span>
- <el-input class="value"></el-input>
- </div>
- <div class="map-add-footer">
- <el-button size="mini" @click="close">鍏抽棴</el-button>
- <el-button type="primary" size="mini" @click="saveDevice">淇濆瓨</el-button>
- </div>
- </div>
+ <addMachine :id="id" :machineid="machineid" @setmachineId="setmachineId" v-else @close="close"/>
</div>
</template>
@@ -112,7 +88,16 @@
return v
}
}
+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,
+ Device
+ },
props: {
status: {
type: Number,
@@ -125,32 +110,52 @@
type: String,
},
id: {
- type: Number
+ type: [Number,String]
}
},
computed: {
- mapNew () {
- if (this.currentMap.length > 0) return this.currentMap
- if (!this.map) return []
- let arr = this.map.filter(item => item.rowspan !== 0 || item.colspan !== 0)
- return arr
+ 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
+ }
},
- tableW () {
- this.mapNew
- },
+ 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() {
return {
+ height: 0,
plantName: '',
- rows: 10,
- cols: 10,
+ rows: 20,
+ cols: 50,
map: null, // 鍦板浘鏁版嵁
addStatus: false,
position: {},
+ selection:[],
showAction: false,
tdMounseDown: false,
- selection: [],
- range: {x: '',x1: '',y: '',y1: ''}
+ range: {x: '',x1: '',y: '',y1: ''},
+ currentAdd: {},
+ colgroups:[]
}
},
watch: {
@@ -194,11 +199,26 @@
},
immediate: true
},
- map: {
+ currentMap: {
handler () {
-
+ if (!this.currentMap || this.currentMap.length === 0) return
+ 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: })
+ })
+ }
+
},
- deep: true
+ immediate: true
+ },
+ map () {
+ this.height = (document.querySelector('.table').getBoundingClientRect().height - 30) / 20
}
},
mounted() {
@@ -207,19 +227,26 @@
if(this.status ===2) return
this.tdMounseDown = false
})
-
- if (this.id) {
- this.getmachineList()
- this.map = this.currentMap
- this.rows = this.currentMap.length
- this.cols = this.currentMap[0].length
+ try {
+ this.height = (document.querySelector('.table').getBoundingClientRect().height - 30) / 20
+ } catch (error) {
}
+ console.log(this.$route.name)
},
beforeUpdate() {
- this.$el.querySelector('table').removeEventListener('contextmenu', this.contextmenu)
+ try {
+ this.$el.querySelector('table').removeEventListener('contextmenu', this.contextmenu)
+ } catch (error) {
+
+ }
+
},
updated() {
- this.$el.querySelector('table').addEventListener('contextmenu', this.contextmenu)
+ try {
+ this.$el.querySelector('table').addEventListener('contextmenu', this.contextmenu)
+ } catch (error) {
+
+ }
},
methods: {
createMap() {
@@ -240,17 +267,27 @@
this.map = data
},
contextmenu(e) {
- if(this.status ===2) return
+ console.log(e)
+ if(this.status ===2) return
+ if (!this.range.x) return
// if (this.range.x !=='') return
e.preventDefault()
e.stopPropagation()
let { pageX: left, pageY: top } = e
this.showAction = true
- let { top: t } = document.querySelector('.map').getBoundingClientRect()
- this.position = {
- left: left + 'px',
- top: top - t + 10 + 'px'
+ let { top: t } = document.querySelector('.table').getBoundingClientRect()
+ if (window.innerWidth - left < 100) {
+ this.position = {
+ right: 0,
+ top: top - t + 10 + 'px'
+ }
+ } else {
+ this.position = {
+ left: left + 'px',
+ top: top -t + 10 + 'px'
+ }
}
+
},
onMousedown(e, v) {
if(this.status ===2) return
@@ -306,9 +343,10 @@
}
}
}
- setData(layoutNew)
- setRange({x,y,x1:x,y1: y})
- setShowMenu(false)
+ this.showAction = false
+ // setData(layoutNew)
+ // setRange({x,y,x1:x,y1: y})
+ // setShowMenu(false)
},
sign (type) {
const { x, x1, y, y1 } = this.range
@@ -326,24 +364,11 @@
if(this.status ===2) return
e.stopPropagation()
this.addStatus = true
- },
- close () {
- this.addStatus = false
- },
- saveDevice () {
- this.close()
- },
- getmachineList () {
- this.$http.post('/machine/list', {
- status: '',
- plantId: this.id
- }).then(res => {
- console.log(res)
- })
+ this.currentAdd = v
},
save () {
if (this.status === 0) {
- this.$http.post('/plant/save',{
+ this.$http.postJson('/plant/save',{
name: this.plantName,
gridSetting: JSON.stringify(this.map)
}).then(res => {
@@ -351,7 +376,7 @@
console.log(res)
})
} else if(this.status === 1) {
- this.$http.post('/plant/modify',{
+ this.$http.postJson('/plant/modify',{
name: this.plantName,
gridSetting: JSON.stringify(this.map),
id: this.id
@@ -364,11 +389,42 @@
},
out () {
this.$emit('out')
+ },
+ close () {
+ this.addStatus = false
+ },
+ edit (e) {
+ if(this.status ===2) return
+ e.stopPropagation()
+ this.addStatus = true
+ },
+ setmachineId (id) {
+ console.log(id)
+ if (!id) return
+ let i = this.currentAdd.rowIndex
+ let j = this.currentAdd.colIndex
+ let arr = [...(this.map[i])];
+ arr[j].id = id
+ this.$set(this.map,i,arr)
+ this.close()
}
},
}
</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%;
@@ -376,42 +432,16 @@
.map-container {
width: 100%;
height: 100%;
- overflow: auto;
+ padding: 20px;
+ overflow: hidden;
position: relative;
- }
- .map-add {
- width: 100%;
- height: 100%;
- overflow: auto;
- position: relative;
- .map-add-item {
- margin-top: 24px;
- display: flex;
- justify-content: center;
- align-items: center;
- span {
- width: 150px;
- font-size: 16px;
- color: #C6DCE0;
- text-align: right;
- margin-right: 16px;
- }
- .value {
- width: 400px;
- }
- }
- .map-add-footer {
- position: absolute;
- bottom: 0;
- text-align: right;
- padding-right: 30px;
- width: 100%;
- }
+ display: flex;
+ flex-direction: column;
}
}
.table-tool {
- margin-top: 10px;
+ padding-bottom: 50px;
display: flex;
justify-content: flex-start;
@@ -435,32 +465,42 @@
}
}
+.table.active {
+ // position: relative;
+ // left: 100%;
+ // animation: move 6s infinite alternate;
+}
.table {
- padding: 10px;
- margin-top: 10px;
- display: flex;
- justify-content: flex-start;
- overflow: auto;
-
-
+ // margin-top: 10px;
+ // display: flex;
+ // justify-content: flex-start;
+ width: 100%;
+ height: 100%;
+ position: relative;
+ overflow-x: scroll;
+
.table-action {
position: absolute;
z-index: 999;
color: #fff;
-
+ width: 100px;
div {
margin-top: 4px;
cursor: pointer;
}
+ div:hover {
+ color: #68D9FF;
+ }
}
table {
- border: 1px solid #1662DB;
+ width: 100%;
border-collapse: collapse;
- table-layout: fixed;
- word-wrap: break-word;
+ // table-layout: fixed;
+ // word-wrap: break-word;
overflow: hidden;
- border-radius: 20px;
+ border-radius: 10px;
+ // box-sizing: border-box;
td {
// width: 50px;
// height: 50px;
@@ -468,10 +508,77 @@
border: 1px solid #1662DB;
vertical-align: middle;
text-align: center;
- img {
+ & > img {
width: 20px;
height: 20px;
cursor: pointer;
+ }
+ .machine {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ & > p {
+ margin-top: 20px;
+ color: #E9FFFF;
+ text-shadow: 0px 1px 11px #549BD4;
+ background: linear-gradient(180deg, #9AFEFE 0%, #4B78CD 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ text-align: center;
+ }
+ & > div {
+ flex: 1 1 auto;
+ margin-top: 20px;
+ display: flex;
+ align-items: center;
+ margin-bottom: 20px;
+
+ overflow: hidden;
+ .img {
+ width: 50%;
+ height: 100%;
+ margin-left: 20px;
+ border: 1px solid #444C55;
+ border-radius: 10px;
+ position: relative;
+ img {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ width: 80%;
+ }
+ }
+ ul {
+ flex: 1 1 auto;
+ height: 100%;
+ margin-left: 20px;
+ list-style: none;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: space-around;
+ li {
+ width: 100%;
+ display: flex;
+ font-size: 12px;
+ align-items: center;
+ & > div {
+ margin-left: 20px;;
+ }
+ p {
+ color: #E9FFFF;
+ text-shadow: 0px 1px 11px #549BD4;
+ }
+ img {
+ width: 40px;
+ height: 40px;
+ }
+ }
+ }
+ }
+
}
}
td.active {
@@ -481,7 +588,26 @@
// width: 20px;
// height: 20px;
background: #1662DB;
+ div {
+ // width: 20px;
+ // height: 20px;
+ }
}
+ td.device {
+ // width: 400px;
+ // height: 400px;
+ overflow: hidden;
+ div {
+ // width: 400px;
+ }
+ }
+ }
+}
+.grid {
+ width: 100%;
+ height: 100%;
+ div {
+ border: 1px solid red;
}
}
</style>
--
Gitblit v1.9.3