From 12e38a9c58fa02cc42104793609ac4e240bc6184 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 07 十一月 2024 16:46:29 +0800
Subject: [PATCH] 工况管理
---
web/src/views/modules/taskReliability/ModelView.vue | 72 ++++++++++++-----------
web/src/views/modules/taskReliability/OperatCondit.vue | 32 ++++++++--
web/src/views/modules/taskReliability/OperatConditModel.vue | 18 +++---
3 files changed, 72 insertions(+), 50 deletions(-)
diff --git a/web/src/views/modules/taskReliability/ModelView.vue b/web/src/views/modules/taskReliability/ModelView.vue
index 08fab2a..c52f956 100644
--- a/web/src/views/modules/taskReliability/ModelView.vue
+++ b/web/src/views/modules/taskReliability/ModelView.vue
@@ -1,13 +1,16 @@
<template>
<div>
- <div class="fa-card-a">
-
- <div id="containerImg" style="border: 1px solid #EAEBEE;border-radius: 6px;
- box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);height: 100%">
+ <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
+ <el-form-item :label="modelName"></el-form-item>
+ <el-form-item style="float: right">
+ <el-button type="danger" @click="closeDigram()">鍏抽棴</el-button>
+ </el-form-item>
+ </el-form>
+ <div style="border: 1px solid #EAEBEE;border-radius: 6px;box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);height: calc(100vh - 233px);">
+ <div id="containerImg"></div>
</div>
<config-node ref="configNode" v-show="type === 'node'"/>
<config-edge ref="configEdge" v-show="type === 'edge'"/>
- </div>
</div>
</template>
@@ -668,17 +671,22 @@
this.projectId = this.$route.params.projectId
console.log(this.$route.params.projectId, 'this.$route.params.projectId')
console.log(this.$route.params.diagramId, 'this.$route.params.diagramId')
- }
+ },
},
mounted() {
this.type = 'grid'
},
methods: {
init(row) {
- this.modelName = row.modelName
+ this.modelName = row.title
this.dataForm.id = row.id
+ this.collapseTransition = row.collapseTransition
this.initDigram()
console.log(this.dataForm, 'init(row){')
+ },
+ closeDigram(){
+ this.collapseTransition = 16
+ this.$emit('closeWindow',this.collapseTransition)
},
async getDiagram(modelId) {
this.isFirstLoad = true;
@@ -697,7 +705,8 @@
this.isFirstLoad = false;
console.log(this.diagramJson.cells.length, 'this.diagramJson.cells.length')
- this.graph.positionContent('left')
+ // this.graph.positionContent('left')
+ this.graph.positionContent('left',{ padding: { left: 0 }})
// this.graph.centerContent()
// this.graph.zoomToFit()
} else {
@@ -719,7 +728,7 @@
this.graph = new Graph({
container: document.getElementById('containerImg'),
width: document.documentElement.clientWidth,
- height: document.documentElement.clientHeight - 200,
+ height: document.documentElement.clientHeight - 240,
// async: true,
grid: {
visible: true,
@@ -734,23 +743,16 @@
}
},
},
- scroller: {
- enabled: true,
- pageVisible: true,
- autoResize: true,
- pageBreak: true,
- pannable: true,
- minVisibleWidth: 200,
- minVisibleHeight: 200,
- modifiers: 'shift',
- },
- mousewheel: {
- enabled: true,
- zoomAtMousePosition: true,
- modifiers: 'ctrl',
- minScale: 0.5,
- maxScale: 3,
- },
+ // scroller: {
+ // enabled: true,
+ // pageVisible: true,
+ // autoResize: true,
+ // pageBreak: true,
+ // pannable: true,
+ // minVisibleWidth: 200,
+ // minVisibleHeight: 200,
+ // modifiers: 'shift',
+ // },
connecting: {
router: {
name: 'manhattan',
@@ -822,12 +824,12 @@
},
resizing: true,
rotating: true,
- selecting: {
- enabled: true,
- rubberband: true,
- rubberEdge: true,
- showNodeSelectionBox: true,
- },
+ // selecting: {
+ // enabled: true,
+ // rubberband: true,
+ // rubberEdge: true,
+ // showNodeSelectionBox: true,
+ // },
snapline: true,
keyboard: true,
clipboard: true,
@@ -1451,8 +1453,8 @@
leftTopY = centerY
let dragNodeType = dragNode.getData().nodeType
if (dragNodeType === 'node') {
- width = 60
- height = 60
+ width = 100
+ height = 70
} else if (dragNodeType === 'dashedBox') {
width = 60
height = 40
@@ -1461,7 +1463,7 @@
height = 175
} else {
width = 270
- height = 60
+ height = 70
}
leftTopX = centerX - width / 2
leftTopY = centerY - height / 2
diff --git a/web/src/views/modules/taskReliability/OperatCondit.vue b/web/src/views/modules/taskReliability/OperatCondit.vue
index f968740..e30ce91 100644
--- a/web/src/views/modules/taskReliability/OperatCondit.vue
+++ b/web/src/views/modules/taskReliability/OperatCondit.vue
@@ -1,7 +1,7 @@
<template>
<div>
- <el-row :gutter="16">
- <el-col :span="14">
+ <el-row>
+ <el-col :span="collapseTransition">
<div class="mod-taskReliability-operatCondit}">
<div class="fa-card-a">
<div style="margin-top: 10px">
@@ -20,7 +20,7 @@
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
:row-class-name="tableRowClassName"
- v-adaptive="{bottomOffset:70}"
+ v-adaptive="{bottomOffset:30}"
border @row-click="selectOperatCondit" @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="name" label="宸ュ喌鍚嶇О"/>
@@ -35,22 +35,30 @@
</div>
</div>
</el-col>
- <el-col :span="10">
+ <el-col :span="8">
<div class="fa-card-a">
- <opera-condit-model ref="model"/>
+ <opera-condit-model ref="model" @collapseTransitionChange="collapseTransitionChange"/>
</div>
</el-col>
+ <el-col :span="16 - collapseTransition">
+ <div class="fa-card-a">
+ <model-view ref="modelView" @closeWindow="closeWindow"></model-view>
+ </div>
+ </el-col>
+
</el-row>
</div>
</template>
<script>
import AddOrUpdate from './OperatCondit-AddOrUpdate'
+ import ModelView from "./ModelView";
import OperaConditModel from "./OperatConditModel";
export default {
data() {
return {
+ collapseTransition:16,
productList: [],
dataForm: {
productId: '',
@@ -64,7 +72,8 @@
},
components: {
OperaConditModel,
- AddOrUpdate
+ AddOrUpdate,
+ ModelView
},
methods: {
add() {
@@ -99,6 +108,17 @@
} else {
return 'not-select-row';
}
+ },
+ collapseTransitionChange(param){
+ console.log(param,'collapseTransition')
+ this.collapseTransition = param.collapseTransition
+ this.$nextTick(() => {
+ this.$refs.modelView.init(param)
+ })
+ },
+ closeWindow(collapseTransition){
+ this.collapseTransition = collapseTransition
+ this.$refs.tableObj.query()
}
}
}
diff --git a/web/src/views/modules/taskReliability/OperatConditModel.vue b/web/src/views/modules/taskReliability/OperatConditModel.vue
index 78e4fd2..1a763c3 100644
--- a/web/src/views/modules/taskReliability/OperatConditModel.vue
+++ b/web/src/views/modules/taskReliability/OperatConditModel.vue
@@ -9,7 +9,7 @@
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
- v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle"
+ v-adaptive="{bottomOffset:30}" border @selection-change="table.selectionChangeHandle"
row-key="iid"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:default-expand-all="true">
@@ -33,9 +33,9 @@
</template>
</el-table-column>
</el-table>
- <el-dialog v-dialogDrag :title="title" top="1vh" width='95%' :visible.sync="dialogVisible2" v-if="dialogVisible2">
- <model-view ref="modelView"></model-view>
- </el-dialog>
+<!-- <el-dialog v-dialogDrag :title="title" top="1vh" width='95%' :visible.sync="dialogVisible2" v-if="dialogVisible2">-->
+<!-- <model-view ref="modelView"></model-view>-->
+<!-- </el-dialog>-->
</zt-table-wraper>
</div>
</template>
@@ -144,15 +144,15 @@
}
},
drawRBD(row) {
- this.dialogVisible2 = true
- this.title=row.modelName + '妯″瀷璁捐'
let param = {
id: row.modelId,
modelName: row.modelName,
+ collapseTransition:0,
+ title:row.modelName + '妯″瀷璁捐'
}
- this.$nextTick(() => {
- this.$refs.modelView.init(param)
- })
+ this.$emit('collapseTransitionChange', param)
+
+
}
}
}
--
Gitblit v1.9.1