From fb345cc1a3fb3408bc9c0dd59a0a7935c5344afa Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 05 七月 2023 16:21:19 +0800
Subject: [PATCH] 扭矩配置界面调取接口渲染，利用率界面增加层级并合并显示
---
src/views/mdc/base/Torqueconfiguration.vue | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/src/views/mdc/base/Torqueconfiguration.vue b/src/views/mdc/base/Torqueconfiguration.vue
index 3d9239f..6196264 100644
--- a/src/views/mdc/base/Torqueconfiguration.vue
+++ b/src/views/mdc/base/Torqueconfiguration.vue
@@ -1,20 +1,30 @@
<template>
- <a-card :bordered="false">
- <div style="width: 100%; height: 100%;overflow: hidden">
+ <div style="width: 100%; height: 100%;">
+ <a-card :bordered="false">
<a-row type="flex" :gutter="16">
- <a-col :md="5" :sm="24">
- <base-tree @getCurrSelected="changeSelectionNode"></base-tree>
+ <a-col :md="4">
+ <a-tabs :activeKey="activeKey" @change="tabChange">
+ <a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
+ <base-tree @getCurrSelected="changeSelectionNode"></base-tree>
+ </a-tab-pane>
+ <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">,
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
+ ></depart-tree>
+ </a-tab-pane>
+ </a-tabs>
</a-col>
- <a-col :md="24-5" :sm="24">
- <torqueconfiguration-list :equement="selectEquement"></torqueconfiguration-list>
+ <a-col :md="20">
+ <!--<EfficiencyList ref="EfficiencyList" :nodePeople='selectPeople' :nodeTree = 'selectEquement' :Type="slectTypeTree"></EfficiencyList>-->
+ <torqueconfiguration-list ref="TorqueconfigurationList" :nodePeople='selectPeople' :nodeTree = 'selectEquement' :Type="slectTypeTree"></torqueconfiguration-list>
</a-col>
</a-row>
- </div>
- </a-card>
+ </a-card>
+ </div>
+
</template>
<script>
- import { putAction,getAction } from '@/api/manage'
+ import { putAction, getAction } from '@/api/manage'
import { frozenBatch } from '@/api/api'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JInput from '@/components/jeecg/JInput'
@@ -22,7 +32,7 @@
import TorqueconfigurationList from './modules/TorqueconfigurationList/TorqueconfigurationList'
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
-
+ import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
export default {
name: 'Torqueconfiguration',
components: {
@@ -30,23 +40,42 @@
JInput,
BaseTree,
JSuperQuery,
- TorqueconfigurationList,
+ DepartTree,
+ TorqueconfigurationList
},
data() {
return {
- description: '鎵煩閰嶇疆绠＄悊椤甸潰',
- selectEquement:{},
- equipmentStatisticsInfo:{},
- url:{
- equipmentStatistics:"/mdc/equipment/equipmentStatistics"
+ activeKey: '1',
+ description: '璁惧淇℃伅',
+ selectEquementId: '',
+ selectEquement: {},
+ selectPeople:{},
+ slectTypeTree:"",
+ url: {
+ equipmentStatistics: '/mdc/equipment/equipmentStatistics'
}
}
},
created() {
},
methods: {
- changeSelectionNode(val){
+ tabChange(val) {
+ // console.log(val);
+ this.activeKey = val
+ this.slectTypeTree = val
+ },
+ // changeSelection(val) {
+ // this.selectEquementId = val
+ // this.$refs.efficiencyList.pQuery(val)
+ // this.$refs.efficiencyList.searchQuery()
+ // },
+ changeSelectionNode(val) {
this.selectEquement = val
+ this.slectTypeTree = "1"
+ },
+ changeSelectionNodedd(val) {
+ this.selectPeople = val
+ this.slectTypeTree = "2"
}
}
--
Gitblit v1.9.3