From db75c6a59acad51cb17577c522e6a4debf72b3b6 Mon Sep 17 00:00:00 2001
From: 13937891274 <kxc0822>
Date: 星期二, 02 八月 2022 17:54:30 +0800
Subject: [PATCH] 数据对接

---
 src/views/facilityManagement/InstrumentationInformation/index.vue |   64 ++++++++++++++++----------------
 1 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/views/facilityManagement/InstrumentationInformation/index.vue b/src/views/facilityManagement/InstrumentationInformation/index.vue
index 3a8d289..55bcddd 100644
--- a/src/views/facilityManagement/InstrumentationInformation/index.vue
+++ b/src/views/facilityManagement/InstrumentationInformation/index.vue
@@ -17,9 +17,8 @@
 		</el-form>
 		<el-row>
 			<el-col :span="4">
-			<el-input v-model="filterText" style="height: 30px" placeholder="请输入关键字" />
+				<el-input v-model="filterText" style="height: 30px" placeholder="请输入关键字" />
 				<div class="tree">
-					
 					<!-- <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>
@@ -27,7 +26,7 @@
 			<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>
@@ -38,17 +37,17 @@
 					</div>
 				</div>
 				<div style="padding-left: 10px">
-					<el-table ref="multipleTableRef" :data="tableData" style="width: 100%">
+					<el-table ref="multipleTableRef" :data="tableData" style="width: 100%"  @selection-change="handleSelectionChange">
 						<el-table-column type="selection" align="center" width="55" />
 						<el-table-column type="expand">
 							<template #default="scope">
 								<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"
@@ -61,23 +60,23 @@
 									></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>
@@ -112,7 +111,7 @@
 			</el-col>
 		</el-row>
 		<!-- <updata ref="Show"></updata> -->
-		<Dailog ref="openAdd"></Dailog>
+		<Dailog ref="openAdd" @navAddorUpdata="onAddorUpdata"></Dailog>
 	</div>
 </template>
 <script lang="ts">
@@ -142,6 +141,7 @@
 		// 重置
 		const resetForm = () => {
 			ruleForm.searchParams.qName = '';
+			ruleForm.searchParams.positionNum = '';
 			listApi();
 		};
 		const listApi = () => {
@@ -183,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) => {
@@ -226,13 +226,13 @@
 			}
 			deletAll.value = arr.toString();
 			if (val.length == 1) {
-				// warning.value = false;
+				warning.value = false;
 				danger.value = false;
 			} else if (val.length == 0) {
-				// warning.value = true;
+				warning.value = true;
 				danger.value = true;
 			} else {
-				// warning.value = true;
+				warning.value = true;
 				danger.value = false;
 			}
 		};
@@ -272,7 +272,7 @@
 				.getequipmentTypeMngTreeData()
 				.then((res) => {
 					if (res.data.code == 200) {
-						data.value= res.data.data;
+						data.value = res.data.data;
 					} else {
 						ElMessage({
 							showClose: true,
@@ -286,7 +286,7 @@
 			label: 'typeName',
 			children: 'childList',
 			value: 'id',
-		}
+		};
 		watch(filterText, (val) => {
 			treeRef.value!.filter(val);
 		});
@@ -295,18 +295,18 @@
 			if (!value) return true;
 			return data.typeName.includes(value);
 		};
-       const handleNodeClick=(data: Tree)=>{
-			ruleForm.searchParams.positionNum=data.id
+		const handleNodeClick = (data: Tree) => {
+			ruleForm.searchParams.positionNum = data.id;
 			listApi();
-	   }
-		const data=ref([])
+		};
+		const data = ref([]);
 		onMounted(() => {
 			listApiTree();
 		});
 		const handleClicks = (tab: TabsPaneContext, event: Event) => {
 			console.log(tab, event);
 		};
-		
+
 		const activeName = ref('first');
 		// const Show=ref()
 		// const openUp=()=>{

--
Gitblit v1.9.2