From ff6f347451a35dcfcdc765d7af73431663a08123 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: Sat, 30 Jul 2022 18:42:46 +0800
Subject: [PATCH] 对接
---
src/views/facilityManagement/InstrumentationInformation/index.vue | 83 ++++++++++++++++++++++-------------------
1 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/src/views/facilityManagement/InstrumentationInformation/index.vue b/src/views/facilityManagement/InstrumentationInformation/index.vue
index d975b7a..3a43231 100644
--- a/src/views/facilityManagement/InstrumentationInformation/index.vue
+++ b/src/views/facilityManagement/InstrumentationInformation/index.vue
@@ -17,15 +17,17 @@
</el-form>
<el-row>
<el-col :span="4">
+ <el-input v-model="filterText" style="height: 30px" placeholder="请输入关键字" />
<div class="tree">
- <el-input v-model="filterText" style="height: 30px" placeholder="Filter keyword" />
- <el-tree ref="treeRef" class="filter-tree" :data="data" :props="props" :filter-node-method="filterNode" />
+
+ <!-- <el-tree ref="treeRef" class="filter-tree" :data="data" :props="props" :filter-node-method="filterNode" /> -->
+ <el-tree ref="treeRef" :data="data" :props="props" @node-click="handleNodeClick" :filter-node-method="filterNode" />
</div>
</el-col>
<el-col :span="20">
<div class="btns">
<div>
- <el-button size="default" type="primary" :icon="Plus" @click="openD">新建</el-button>
+ <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
<el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button>
<el-button size="default" :disabled="danger" type="danger" :icon="Delete" @click="onDeleteAll" plain>删除</el-button>
</div>
@@ -43,10 +45,10 @@
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClicks" style="margin: 0 5%">
<el-tab-pane label="设备保养" name="first">
<el-table ref="multipleTableRef" :data="scope.row.takecareDetailList" style="width: 100%">
- <el-table-column property="name" align="center" label="保养情况" sortable />
- <el-table-column property="name" align="center" label="保养负责人" sortable />
+ <el-table-column property="takecareMemo" align="center" label="保养情况" sortable />
+ <el-table-column property="leadingPersonId" align="center" label="保养负责人" sortable />
<el-table-column property="takecareDate" align="center" label="保养日期" sortable />
- <el-table-column property="name" align="center" label="保养负责人单位" sortable />
+ <el-table-column property="leadingPersonDepartmentId" align="center" label="保养负责人单位" sortable />
</el-table>
</el-tab-pane>
<el-tab-pane label="设备检查" name="second"
@@ -59,29 +61,29 @@
></el-tab-pane>
<el-tab-pane label="设备检测" name="third">
<el-table ref="multipleTableRef" :data="scope.row.testDetailList" style="width: 100%">
- <el-table-column property="name" align="center" label="检测人" sortable />
- <el-table-column property="name" align="center" label="检测日期" sortable />
- <el-table-column property="name" align="center" label="检测人单位" sortable />
- <el-table-column property="name" align="center" label="检测内容" sortable />
- <el-table-column property="name" align="center" label="检测结果" sortable />
- <el-table-column property="name" align="center" label="检测状态" sortable />
+ <el-table-column property="testPersonId" align="center" label="检测人" sortable />
+ <el-table-column property="testDate" align="center" label="检测日期" sortable />
+ <el-table-column property="testPersonDepartmentId" align="center" label="检测人单位" sortable />
+ <el-table-column property="testMemo" align="center" label="检测内容" sortable />
+ <el-table-column property="testResult" align="center" label="检测结果" sortable />
+ <el-table-column property="testStatus" align="center" label="检测状态" sortable />
</el-table>
</el-tab-pane>
<el-tab-pane label="设备维修" name="fourth">
<el-table ref="multipleTableRef" :data="scope.row.repaireDetailList" style="width: 100%">
- <el-table-column property="name" align="center" label="设施异常项" sortable />
- <el-table-column property="name" align="center" label="维修状态" sortable />
- <el-table-column property="name" align="center" label="维修情况" sortable />
- <el-table-column property="name" align="center" label="维修负责人" sortable />
- <el-table-column property="name" align="center" label="维修负责人单位" sortable />
- <el-table-column property="name" align="center" label="维修开始日期" sortable />
- <el-table-column property="name" align="center" label="维修结束日期" sortable />
+ <el-table-column property="exceptionInfo" align="center" label="设施异常项" sortable />
+ <el-table-column property="repairStatus" align="center" label="维修状态" sortable />
+ <el-table-column property="repairMemo" align="center" label="维修情况" sortable />
+ <el-table-column property="repairPersonId" align="center" label="维修负责人" sortable />
+ <el-table-column property="repairPersonDepartmentId" align="center" label="维修负责人单位" sortable />
+ <el-table-column property="repairStartDate" align="center" label="维修开始日期" sortable />
+ <el-table-column property="repairEndDate" align="center" label="维修结束日期" sortable />
</el-table>
</el-tab-pane>
</el-tabs>
</template>
</el-table-column>
- <el-table-column property="qName" label="装置设施名称" align="center" sortable/>
+ <el-table-column property="qName" label="装置设施名称" align="center" sortable />
<el-table-column property="positionNum" align="center" label="装置设施位号" sortable />
<el-table-column property="qUsage" align="center" label="装置设施用途" sortable />
<el-table-column property="model" label="装置设施型号" align="center" sortable show-overflow-tooltip />
@@ -89,8 +91,8 @@
<el-table-column property="setPart" label="设施部位" align="center" sortable show-overflow-tooltip />
<el-table-column label="操作" align="center" width="250">
<template #default="scope">
- <el-button link type="primary" size="default" :icon="View">查看</el-button>
- <el-button link type="primary" size="default" :icon="EditPen">修改</el-button>
+ <el-button link type="primary" size="default" :icon="View" @click="openD('查看', scope.row.id)">查看</el-button>
+ <el-button link type="primary" size="default" :icon="EditPen" @click="openD('修改', scope.row.id)">修改</el-button>
<el-button link type="primary" size="default" :icon="Delete" @click="onDelete(scope.row.id)">删除</el-button>
</template>
</el-table-column>
@@ -99,9 +101,9 @@
<el-pagination
v-model:currentPage="currentPage4"
v-model:page-size="pageSize4"
- :page-sizes="[100, 200, 300, 400]"
+ :page-sizes="[10, 20, 30, 40]"
layout="total, sizes, prev, pager, next, jumper"
- :total="400"
+ :total="total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
@@ -110,7 +112,7 @@
</el-col>
</el-row>
<!-- <updata ref="Show"></updata> -->
- <Dailog ref="openAdd"></Dailog>
+ <Dailog ref="openAdd" @navAddorUpdata="onAddorUpdata"></Dailog>
</div>
</template>
<script lang="ts">
@@ -119,7 +121,7 @@
import Dailog from '/@/components/equipmentDailog/Dailog.vue';
import { ElTree, TabsPaneContext, ElMessage, ElMessageBox } from 'element-plus';
import { facilityManagementApi } from '/@/api/facilityManagement';
-import { EditPen, Plus, Delete, Download, Refresh, Upload } from '@element-plus/icons-vue';
+import { EditPen, View, Plus, Delete, Download, Refresh, Upload } from '@element-plus/icons-vue';
interface Tree {
label: string;
children?: Tree[];
@@ -181,7 +183,7 @@
// 弹窗
const openAdd = ref();
const openD = (title: String, id: number) => {
- openAdd.value.openDailog(title, id);
+ openAdd.value.openDailog(title,false,id,0);
};
// 删除
const onDelete = (id: number) => {
@@ -264,19 +266,13 @@
};
const filterText = ref('');
const treeRef = ref<InstanceType<typeof ElTree>>();
-
- const props = {
- value: 'id',
- lable: 'typeName',
- children: 'childList',
- };
// 树形
const listApiTree = () => {
facilityManagementApi()
.getequipmentTypeMngTreeData()
.then((res) => {
if (res.data.code == 200) {
- data.value = res.data.data;
+ data.value= res.data.data;
} else {
ElMessage({
showClose: true,
@@ -286,28 +282,38 @@
}
});
};
+ const props = {
+ label: 'typeName',
+ children: 'childList',
+ value: 'id',
+ }
watch(filterText, (val) => {
treeRef.value!.filter(val);
});
const filterNode = (value: string, data: Tree) => {
if (!value) return true;
- return data.label.includes(value);
+ return data.typeName.includes(value);
};
-
- const data = ref([]);
+ const handleNodeClick=(data: Tree)=>{
+ ruleForm.searchParams.positionNum=data.id
+ listApi();
+ }
+ const data=ref([])
onMounted(() => {
listApiTree();
});
const handleClicks = (tab: TabsPaneContext, event: Event) => {
console.log(tab, event);
};
- const activeName=ref("first")
+
+ const activeName = ref('first');
// const Show=ref()
// const openUp=()=>{
// Show.value.openDialog()
// }
return {
+ handleNodeClick,
ruleForm,
resetForm,
listApi,
@@ -339,6 +345,7 @@
Delete,
Download,
Refresh,
+ View,
Upload,
};
},
--
Gitblit v1.9.2