From 3c2e46fef0e866901cbb5de889166b6fda748e5d Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 22 十月 2024 14:39:09 +0800
Subject: [PATCH] 同类设备有多个的修改
---
web/src/views/modules/taskReliability/TimeDiagram.vue | 214 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 137 insertions(+), 77 deletions(-)
diff --git a/web/src/views/modules/taskReliability/TimeDiagram.vue b/web/src/views/modules/taskReliability/TimeDiagram.vue
index ca52c0e..3e6d46f 100644
--- a/web/src/views/modules/taskReliability/TimeDiagram.vue
+++ b/web/src/views/modules/taskReliability/TimeDiagram.vue
@@ -1,6 +1,6 @@
<template>
- <div class="fa-card-a">
- <el-row :gutter="5">
+ <div class="fa-card-a" style="width: calc(100% - 20px);height: calc(100vh - 128px)">
+ <div >
<div class="mod-taskReliability-simulatAssess">
<el-form :inline="true" :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" >
<zt-form-item label="浜у搧鑺傜偣" prop="productId">
@@ -21,27 +21,33 @@
<el-input v-model="dataForm.simulatFrequency" readonly="false">
</el-input>
</zt-form-item>
- <zt-form-item >
- <zt-button @click="getDiagram()">鏌ョ湅鏃跺簭鍥�</zt-button>
+ <zt-form-item>
+ <zt-button @click="getDiagram(null)">鏌ョ湅鏃跺簭鍥�</zt-button>
+<!-- <zt-button @click="graphRightTranslate()">鐢诲竷鍙崇Щ</zt-button>-->
+<!-- <zt-button @click="graphLeftTranslate()">鐢诲竷宸︾Щ</zt-button>-->
</zt-form-item>
</el-form>
- <div>
- <el-col :span="4">
+ <div style="display: flex">
+ <div style="width: 300px">
<div style="margin-right: 5px;height: calc(88vh - 100px)" v-if="isSelect">
<product-model-tree @on-selected="onTreeSelected"
ref="ProductModelTree" :isShow="false" :productId="dataForm.productId"/>
</div>
- </el-col>
- <el-col :span="20">
- <div style="margin-top: 20px">
- <div id="timeDiagram" style="border: 1px solid #EAEBEE;border-radius: 6px;
+ </div>
+ <div style="height: calc(100vh - 233px);width: calc(100% - 300px);margin-left:10px">
+ <div style="margin-top:15px;width:100%; height:100%;border: 1px solid #EAEBEE;border-left:none;border-radius: 6px;
box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);">
+<!-- <div style="width:100%;height: 150px" id="thumbnail" class="minimap-container"></div>-->
+ <timeDiagramThumbnail ref="timeDiagramThumbnail" @getPoint="getPoint"></timeDiagramThumbnail>
+ <div id="flexLayout" style="display:flex;">
+ <textDiagram class="flexLayout-item_1" ref="textDiagram"></textDiagram>
+ <div id="timeDiagram" class="flexLayout-item_2" style="height: 300px" ref="scrollView" @mousewheel="handleScroll"></div>
</div>
</div>
- </el-col>
+ </div>
</div>
</div>
- </el-row>
+ </div>
<el-dialog v-dialogDrag :title="title" top="1vh" width='95%' :visible.sync="dialogVisible2" v-if="dialogVisible2">
<model-view ref="modelView"></model-view>
</el-dialog>
@@ -53,11 +59,15 @@
import ProductModelTree from "../basicInfo/ProductModelTree";
import {Graph, Shape, Addon, Cell} from '@antv/x6'
import ModelView from "./ModelView";
+ import textDiagram from "./textDiagram";
+ import timeDiagramThumbnail from "./timeDiagramThumbnail"
export default {
data() {
return {
+ bigWidth:0,
+ left:400,
title:'',
knob:HTMLDivElement,
dialogVisible2: false,
@@ -72,6 +82,9 @@
MTTR: '',
diagramJson: '',
graph: null,
+ timeDiagramWidth:document.documentElement.clientWidth - 300,
+ timeDiagramHeight:document.documentElement.clientHeight - 133,
+ smallTimeDiagramWidth:document.documentElement.clientWidth - 600,
globalGridAttr: {
type: 'mesh',
size: 10,
@@ -119,26 +132,46 @@
}
}
},
+ created() {
+ let scrollView = this.$refs['scrollView']
+ window.addEventListener('scroll', this.handleScroll,true);
+ },
+ destroyed() {
+ let scrollView = this.$refs['scrollView']
+ window.removeEventListener('scroll', this.handleScroll,true);
+ },
mounted() {
this.getProductList()
+ this.init()
+ this.$refs.textDiagram.init()
+ this.$refs.timeDiagramThumbnail.init()
},
components: {
ModelView,
ProductModelTree,
SimulatCurve,
+ textDiagram,
+ timeDiagramThumbnail
},
methods: {
+ handleScroll(){
+ this.graph.getScrollbarPosition()
+ let left = this.graph.getScrollbarPosition().left
+ console.log(left,'left left')
+ let top = this.graph.getScrollbarPosition().top
+ this.$refs.textDiagram.setScroll(top)
+ this.$refs.timeDiagramThumbnail.getNodePointX(left,this.bigWidth)
+ },
init() {
- console.log(document.documentElement.clientWidth, 'document.documentElement.clientWidth')
- console.log(document.documentElement.clientHeight, 'document.documentElement.clientHeight')
this.graph = new Graph({
container: document.getElementById('timeDiagram'),
- width: document.documentElement.clientWidth,
- height: document.documentElement.clientHeight - 220,
+ // width: document.documentElement.clientWidth - 100,
+ height: document.documentElement.clientHeight - 440,
// async: true,
grid: {
visible: false,
},
+ virtual:true,
embedding: {
enabled: true,
findParent({node}) {
@@ -157,17 +190,34 @@
autoResize: true,
scroller: {
enabled: true,
- pageVisible: true,
- pageBreak: true,
+ className:'my-scroller-drag',
+ pageWidth:100,
+ pageVisible:true,
+ // pageBreak:true,
+ padding: {
+ top: 0,
+ right: 0,
+ bottom: 0,
+ left: 0,
+ },
+ minVisibleWidth: 500,
+ minVisibleHeight:300,
pannable: true,
},
- mousewheel: {
- enabled: true,
- zoomAtMousePosition: true,
- modifiers: 'ctrl',
- minScale: 0.1,
- maxScale: 10,
- },
+ // minimap: {
+ // enabled: true,
+ // container: document.getElementById('thumbnail'),
+ // scalable:false,
+ // width: document.documentElement.clientWidth - 400,
+ // height: 150,
+ // },
+ // mousewheel: {
+ // enabled: true,
+ // zoomAtMousePosition: true,
+ // modifiers: 'ctrl',
+ // minScale: 0.1,
+ // maxScale: 10,
+ // },
createEdge() {
return new Shape.Edge({
data: {
@@ -195,8 +245,8 @@
this.knob = document.createElement('div',false)
this.knob.style.position = 'absolute'
document.getElementById('timeDiagram').appendChild(this.knob)
- this.graph.centerContent()
-
+ this.graph.positionContent('left',{ padding: { left: 0 }})
+ // this.graph.centerContent()
Graph.registerNode(
'custom-rect',
{
@@ -415,7 +465,9 @@
this.type = 'grid'
// this.id = cell.id
})
-
+ this.graph.on('translate', ({ tx, ty }) => {
+ console.log(`褰撳墠鍋忕Щ閲忎綅缃�: x=${tx}, y=${ty}`);
+ });
this.graph.on('cell:click', ({cell}) => {
// this.type.value = cell.isNode() ? "node" : "edge"
this.type = cell.isNode() ? 'node' : 'edge'
@@ -464,7 +516,7 @@
this.graph.on('edge:mouseenter', ({edge,e}) => {
const style = this.knob.style
// e.stopPropagation()
- console.log('edge:mouseenter')
+ // console.log('edge:mouseenter')
if (e && edge.data) {
if (edge.getData().status==='F') {
//console.log(edge.getData(),"eee edge.getData()")
@@ -485,14 +537,14 @@
style.zIndex = 100
this.knob.innerText = `寮�濮嬫椂闂达細${startTimes}\n缁撴潫鏃堕棿锛�${endTimes}`
},0)
- console.log(p,'p p p')
- console.log(style,this.knob,'style style')
+ // console.log(p,'p p p')
+ // console.log(style,this.knob,'style style')
}
}
})
// 榧犳爣绉诲嚭edge鑺傜偣
this.graph.on('edge:mouseleave', ({edge}) => {
- console.log('edge:mouseleave')
+ // console.log('edge:mouseleave')
const style = this.knob.style
style.display = 'none'
})
@@ -518,37 +570,7 @@
console.log(res.data)
this.simulatList = res.data
},
- async onTreeSelected(data) {
- this.graph.unfreeze()
- if (!this.dataForm.taskModelId) {
- this.$alert("璇峰厛閫夋嫨鍏蜂綋浠诲姟")
- return
- }
- if (!this.dataForm.id) {
- this.$alert("璇峰厛閫夋嫨鍏蜂綋浠跨湡璁板綍")
- return
- }
- let params = {
- productId: data.id,
- taskId: this.dataForm.taskModelId,
- fzId: this.dataForm.id
- }
- let res = await this.$http.get('/taskReliability/SimulatAssess/getStatus', {params: params})
- if (res.data !== null) {
- this.diagramJson = JSON.parse(res.data)
- console.log(this.diagramJson, 'this.Diagram json')
- this.graph.fromJSON(this.diagramJson)
- this.graph.positionContent('left')
- //this.graph.zoomToFit()
- this.graph.freeze()
- } else {
- this.graph.fromJSON(this.emptyJson)
- //this.graph.centerContent()
- //this.graph.zoomToFit()
- this.graph.freeze()
- }
- console.log(res.data)
- },
+
// 鑾峰彇淇℃伅
onProductSelected(data) {
this.isSelect = true
@@ -559,7 +581,7 @@
this.$nextTick(() => {
this.$refs.ProductModelTree.getProductList()
})
- this.init()
+ // this.init()
},
onTaskSelected(data) {
console.log(data, ' onProductSelected(data)')
@@ -578,45 +600,71 @@
this.dataForm.samplPeriod = result.data.samplPeriod
this.dataForm.simulatFrequency = result.data.simulatFrequency
},
- async getDiagram() {
+ async onTreeSelected(data) {
+ await this.getDiagram(data.id)
+ },
+ async getDiagram(productId) {
this.graph.unfreeze()
let params = {
- productId: this.dataForm.productId,
+ productId: productId ? productId : this.dataForm.productId,
taskId: this.dataForm.taskModelId,
- fzId: this.dataForm.id
+ fzId: this.dataForm.id,
+ smallWidth: 1200,
+ minPointNum: 5
}
let res = await this.$http.get('/taskReliability/SimulatAssess/getStatus', {params: params})
if (res.data !== null) {
- this.diagramJson = JSON.parse(res.data)
+ this.diagramJson = JSON.parse(res.data.diagramJson)
+ let textDiagramJson = JSON.parse(res.data.textDiagramJson)
+ let smallDiagramJson = JSON.parse(res.data.smallDiagramJson)
console.log(this.diagramJson, 'this.Diagram json')
+ console.log(smallDiagramJson, 'smallDiagramJson')
this.graph.fromJSON(this.diagramJson)
- this.graph.centerContent()
- this.graph.zoomToFit()
+ // this.graph.centerContent()
+ this.graph.positionContent('left',{ padding: { left: 0 }})
+ // this.graph.zoomToFit()
+ this.bigWidth = this.graph.getContentBBox().width
+ console.log(this.bigWidth,'getContentBBox')
+ // this.graph.resize(this.graph.getContentBBox().width,this.graph.getContentBBox().height)
this.graph.freeze()
+ this.$refs.textDiagram.getTextDiagram(textDiagramJson)
+ this.$refs.timeDiagramThumbnail.getThumbnail(smallDiagramJson)
} else {
this.graph.fromJSON(this.emptyJson)
- this.graph.centerContent()
- this.graph.zoomToFit()
+ this.graph.positionContent('left',{ padding: { left: 0 }})
+ // this.graph.centerContent()
+ //this.graph.zoomToFit()
this.graph.freeze()
}
console.log(res.data)
},
+ getPoint(x,smallWidth){
+ let pointX = Number((x * (this.bigWidth / smallWidth )).toFixed(0))
+ // console.log(pointX)
+ this.graph.setScrollbarPosition(pointX, null)
+ // if(pointX<600){
+ // this.graph.setScrollbarPosition(pointX, null, { animation: { duration: 400 }})
+ // }else {
+ // this.graph.scrollToPoint(pointX, null, {animation: {duration: 400}})
+ // }
+ }
}
}
</script>
<style>
#timeDiagram {
display: flex;
- border: 1px solid #dfe3e8;
- width: 100% !important;
+ /*border: 1px solid #dfe3e8;*/
+ /*width: 60% !important;*/
}
+
#timeDiagram .x6-cell.x6-node {
cursor: inherit;
}
- .x6-graph-scroller.x6-graph-scroller-pannable {
- width: 100% !important;
- }
+ #flexLayout .x6-graph-scroller.x6-graph-scroller-pannable {
+ width: 92% !important;
+ }
.x6-widget-stencil {
position: relative;
height: 100%;
@@ -626,4 +674,16 @@
position: relative;
height: 100%;
}
+ .my-scroller-drag {
+ overflow: auto; /* 闇�瑕佹粴鍔ㄦ椂淇濇寔杩欎釜灞炴�� */
+ scrollbar-width: none; /* 瀵逛簬Firefox */
+ }
+
+ .my-scroller-drag::-webkit-scrollbar {
+ display: none; /* 瀵逛簬Chrome, Safari鍜孫pera */
+ }
+ .zt.light .el-tab-pane .mod-taskReliability-simulatAssess .el-form{
+ margin-top: 5px;
+ margin-bottom: 0;
+}
</style>
--
Gitblit v1.9.1