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/components/equipmentDailog/Dailog.vue | 74 +++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 28 deletions(-)
diff --git a/src/components/equipmentDailog/Dailog.vue b/src/components/equipmentDailog/Dailog.vue
index b80cb5f..d9a3a93 100644
--- a/src/components/equipmentDailog/Dailog.vue
+++ b/src/components/equipmentDailog/Dailog.vue
@@ -232,21 +232,21 @@
</el-form>
<el-tabs v-model="activeName" class="demo-tabs">
<el-tab-pane label="设备保养" name="first">
- <el-button type="primary" size="default" @click="openMaintenance">新增</el-button>
+ <el-button type="primary" size="default" @click="openMaintenance('新增', '')">新增</el-button>
<el-table :data="form.takecareDetailList" style="width: 100%">
<el-table-column align="center" prop="takecareMemo" label="保养情况" />
<el-table-column align="center" prop="leadingPersonId" label="保养负责人" />
<el-table-column align="center" prop="takecareDate" label="保养日期" />
<el-table-column align="center" prop="leadingPersonDepartmentId" label="保养负责人单位" />
- <el-table-column align="center" prop="address" label="操作">
- <template #default>
- <el-button link type="primary" size="small">查看</el-button>
+ <el-table-column align="center" label="操作">
+ <template #default="scope">
+ <el-button link type="primary" @click="openMaintenance('查看', scope.row)" size="small">查看</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="设备检测" name="second">
- <el-button type="primary" size="default" @click="openDetect">新增</el-button>
+ <el-button type="primary" size="default" @click="openDetect('新增', '')">新增</el-button>
<el-table :data="form.testDetailList" style="width: 100%">
<el-table-column align="center" prop="testPersonId" label="检测人" />
<el-table-column align="center" prop="testDate" label="检测日期" />
@@ -255,14 +255,14 @@
<el-table-column align="center" prop="testResult" label="检测结果" />
<el-table-column align="center" prop="testStatus" label="检测状态" />
<el-table-column align="center" label="操作">
- <template #default>
- <el-button link type="primary" size="small">查看</el-button>
+ <template #default="scope">
+ <el-button link type="primary" @click="openDetect('查看', scope.row)" size="small">查看</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="设备维修" name="third">
- <el-button type="primary" size="default" @click="openRepair">新增</el-button>
+ <el-button type="primary" size="default" @click="openRepair('新增', '')">新增</el-button>
<el-table :data="form.repaireDetailList" style="width: 100%">
<el-table-column align="center" prop="exceptionInfo" label="设施异常项" />
<el-table-column align="center" prop="repairStatus" label="维修状态" />
@@ -272,24 +272,25 @@
<el-table-column align="center" prop="repairStartDate" label="维修开始日期" />
<el-table-column align="center" prop="repairEndDate" label="维修结束日期" />
<el-table-column align="center" label="操作">
- <template #default>
- <el-button link type="primary" size="small">查看</el-button>
+ <template #default="scope"
+ >
+ <el-button link type="primary" @click="openRepair('查看', scope.row)" size="small">查看</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="检查标准设置" name="fourth">
- <el-button type="primary" size="default" @click="openStandard">新增</el-button>
+ <el-button type="primary" size="default" @click="openStandard('新增', '')">新增</el-button>
<el-table :data="form.checkStandardeDetailList" style="width: 100%">
- <el-table-column align="center" type="index" label="序号" width="75" />
+ <el-table-column align="center" prop="indexNum" label="序号" width="75" />
<el-table-column align="center" prop="checkContent" label="检查内容" />
<el-table-column align="center" prop="checkTarget" label="检查指标" />
<el-table-column align="center" prop="unit" label="单位" />
<el-table-column align="center" prop="checkPart" label="巡检部位" />
<el-table-column align="center" prop="rate" label="频次" />
<el-table-column align="center" label="操作">
- <template #default>
- <el-button link type="primary" size="small">查看</el-button>
+ <template #default="scope">
+ <el-button link type="primary" @click="openStandard('查看', scope.row)" size="small">查看</el-button>
</template>
</el-table-column>
</el-table>
@@ -334,10 +335,10 @@
<categoryDailog ref="categoryShow"></categoryDailog>
<regionDailog ref="regionShow"></regionDailog>
<DailogSearchUser ref="UserShow"></DailogSearchUser>
- <maintenanceDailog ref="maintenanceShow"></maintenanceDailog>
- <detectDailog ref="detectShow"></detectDailog>
- <repairDailog ref="repairShow"></repairDailog>
- <standardDailog ref="standardShow"></standardDailog>
+ <maintenanceDailog ref="maintenanceShow" @onMain="main"></maintenanceDailog>
+ <detectDailog ref="detectShow" @onDelect="delect"></detectDailog>
+ <repairDailog ref="repairShow" @onRepair="Repair"></repairDailog>
+ <standardDailog ref="standardShow" @onStand="Stand"></standardDailog>
</template>
<script lang="ts">
import { defineComponent, ref, reactive } from 'vue';
@@ -539,9 +540,9 @@
Dailogtype.value = type;
if (num == 0) {
titles.value = `${title}仪表信息`;
- }else if(num==1){
+ } else if (num == 1) {
titles.value = `${title}设备设施`;
- }else if(num==2){
+ } else if (num == 2) {
titles.value = `${title}设备设施`;
}
@@ -595,20 +596,20 @@
UserShow.value.openDailog();
};
const maintenanceShow = ref();
- const openMaintenance = () => {
- maintenanceShow.value.openDailog();
+ const openMaintenance = (title: string, data: any) => {
+ maintenanceShow.value.openDailog(title, data);
};
const detectShow = ref();
- const openDetect = () => {
- detectShow.value.openDailog();
+ const openDetect = (title: string, data: any) => {
+ detectShow.value.openDailog(title, data);
};
const repairShow = ref();
- const openRepair = () => {
- repairShow.value.openDailog();
+ const openRepair = (title: string, data: any) => {
+ repairShow.value.openDailog(title, data);
};
const standardShow = ref();
- const openStandard = () => {
- standardShow.value.openDailog();
+ const openStandard = (title: string, data: any) => {
+ standardShow.value.openDailog(title, data);
};
// 上传
const fileList = ref<UploadUserFile[]>([
@@ -640,6 +641,19 @@
() => false
);
};
+ // 回传
+ const main = (val: any) => {
+ form.value.takecareDetailList.push(val);
+ };
+ const delect = (val: any) => {
+ form.value.testDetailList.push(val);
+ };
+ const Repair= (val:any)=>{
+ form.value.repaireDetailList.push(val);
+ }
+ const Stand=(val:any)=>{
+ form.value.checkStandardeDetailList.push(val);
+ }
//全屏
const full = ref(false);
const toggleFullscreen = () => {
@@ -650,6 +664,10 @@
}
};
return {
+ main,
+ delect,
+ Repair,
+ Stand,
resetForm,
submitForm,
titles,
--
Gitblit v1.9.2