shj
2022-08-10 6509ce4d7796dd5ec7361fcca96a01b2f54eff14
对接
已修改10个文件
224 ■■■■■ 文件已修改
src/components/DailogSearchUser/index.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/equipmentDailog/Dailog.vue 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/equipmentDailog/detectDailog.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/equipmentDailog/maintenanceDailog.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/equipmentDailog/repairDailog.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/equipmentDailog/standardDailog.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/facilityManagement/InstrumentationInformation/index.vue 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/facilityManagement/ProductionEquipment/index.vue 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/facilityManagement/deviceType/component/Dailog.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/facilityManagement/safetyEquipment/index.vue 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/DailogSearchUser/index.vue
@@ -13,15 +13,15 @@
            <el-col :span="14" style="padding: 20px">
                <el-form ref="ruleFormRef" :model="ruleForm" status-icon>
                    <el-row>
                        <el-col :span="10" :offset="1">
                        <!-- <el-col :span="10" :offset="1">
                            <el-form-item size="default">
                                <el-input v-model="ruleForm.pass" placeholder="登录名" />
                            </el-form-item>
                        </el-col>
                        </el-col> -->
                        <el-col :span="8" :offset="1">
                            <el-form-item>
                                <el-button size="default" type="primary" >查询</el-button>
                                <el-button size="default">重置</el-button>
                                <!-- <el-button size="default" type="primary" >查询</el-button> -->
                                <el-button size="default" @click="clear">清除选择</el-button>
                            </el-form-item>
                        </el-col>
                    </el-row>
@@ -189,8 +189,14 @@
            }
            dialogVisible.value = false;
            clear()
        };
        const clear=()=>{
           dynamicTags.value=[]
           radio1.value=""
        }
        return {
            clear,
            total,
            types,
            filterText,
src/components/equipmentDailog/Dailog.vue
@@ -35,7 +35,7 @@
                <el-input v-model="form.setPart" placeholder="请填写设置部位" />
            </el-form-item>
            <el-form-item label="生产日期" size="default" prop="produceTime">
                <el-date-picker v-model="form.produceTime" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
                <el-date-picker v-model="form.produceTime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
            </el-form-item>
            <el-form-item label="使用期限(天)" size="default" prop="useEndDay">
                <el-input v-model="form.useEndDay" placeholder="请填写使用期限" />
@@ -48,7 +48,7 @@
                </el-select>
            </el-form-item>
            <el-form-item label="投用日期" size="default" prop="useDate">
                <el-date-picker v-model="form.useDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
                <el-date-picker v-model="form.useDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
            </el-form-item>
            <el-form-item label="维修状态" size="default" prop="repairStatus">
                <el-select v-model="form.repairStatus" placeholder="请选择" style="width: 100%">
@@ -68,31 +68,33 @@
                <el-date-picker
                    v-model="form.previousCheckDate"
                    format="YYYY-MM-DD HH:mm:ss"
                    value-format="YYYY-MM-DD HH:mm:ss"
                    type="datetime"
                    placeholder="选择日期时间"
                    style="width: 100%"
                />
            </el-form-item>
            <el-form-item label="上次检测日期" size="default" prop="previousTestDate">
                <el-date-picker v-model="form.previousTestDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
                <el-date-picker v-model="form.previousTestDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
            </el-form-item>
            <el-form-item label="上次保养日期" size="default" prop="previousTakecareDate">
                <el-date-picker
                    v-model="form.previousTakecareDate"
                    format="YYYY-MM-DD HH:mm:ss"
                    value-format="YYYY-MM-DD HH:mm:ss"
                    type="datetime"
                    placeholder="选择日期时间"
                    style="width: 100%"
                />
            </el-form-item>
            <el-form-item label="下次检查日期" size="default" prop="nextCheckDate">
                <el-date-picker v-model="form.nextCheckDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
                <el-date-picker v-model="form.nextCheckDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
            </el-form-item>
            <el-form-item label="下次检测日期" size="default" prop="nextTestDate">
                <el-date-picker v-model="form.nextTestDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
                <el-date-picker v-model="form.nextTestDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
            </el-form-item>
            <el-form-item label="下次保养日期" size="default" prop="nextTakecareDate">
                <el-date-picker v-model="form.nextTakecareDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
                <el-date-picker v-model="form.nextTakecareDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
            </el-form-item>
            <el-form-item label="负责人" size="default" prop="leadingPersonName">
                <el-input v-model="form.leadingPersonName" placeholder="请选择">
@@ -169,7 +171,7 @@
                <el-input v-model="form.afterStopStep" placeholder="请填写停用后措施" />
            </el-form-item>
            <el-form-item label="实际停用日期" size="default" prop="actualStopDate">
                <el-date-picker v-model="form.actualStopDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
                <el-date-picker v-model="form.actualStopDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
            </el-form-item>
            <el-form-item label="停用提交人" size="default" prop="stopSubmitPersonName">
                <el-input v-model="form.stopSubmitPersonName" placeholder="请选择">
@@ -179,7 +181,7 @@
                </el-input>
            </el-form-item>
            <el-form-item label="停用提交日期" size="default" prop="stopSubmitDate">
                <el-date-picker v-model="form.stopSubmitDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
                <el-date-picker v-model="form.stopSubmitDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
            </el-form-item>
            <el-form-item label="恢复理由" size="default" prop="recoveryReason">
                <el-input v-model="form.recoveryReason" placeholder="请填写恢复理由" />
@@ -188,6 +190,7 @@
                <el-date-picker
                    v-model="form.recoverySubmitDate"
                    format="YYYY-MM-DD HH:mm:ss"
                    value-format="YYYY-MM-DD HH:mm:ss"
                    type="datetime"
                    placeholder="选择日期时间"
                    style="width: 100%"
@@ -197,6 +200,7 @@
                <el-date-picker
                    v-model="form.actualRecoveryDate"
                    format="YYYY-MM-DD HH:mm:ss"
                    value-format="YYYY-MM-DD HH:mm:ss"
                    type="datetime"
                    placeholder="选择日期时间"
                    style="width: 100%"
@@ -209,6 +213,7 @@
                <el-date-picker
                    v-model="form.destorySubmitDate"
                    format="YYYY-MM-DD HH:mm:ss"
                    value-format="YYYY-MM-DD HH:mm:ss"
                    type="datetime"
                    placeholder="选择日期时间"
                    style="width: 100%"
@@ -218,6 +223,7 @@
                <el-date-picker
                    v-model="form.actualDestoryDate"
                    format="YYYY-MM-DD HH:mm:ss"
                    value-format="YYYY-MM-DD HH:mm:ss"
                    type="datetime"
                    placeholder="选择日期时间"
                    style="width: 100%"
@@ -231,7 +237,7 @@
                    <el-table-column align="center" prop="takecareMemo" label="保养情况" />
                    <el-table-column align="center" prop="leadingPersonName" label="保养负责人" />
                    <el-table-column align="center" prop="takecareDate" :formatter="timeDate" label="保养日期" />
                    <el-table-column align="center" prop="leadingPersonDepartmentId" label="保养负责人单位" />
                    <el-table-column align="center" prop="leadingPersonDepartmentName" label="保养负责人单位" />
                    <el-table-column align="center" label="操作">
                        <template #default="scope">
                            <el-button link type="primary" @click="openMaintenance('查看', scope.row)" size="small">查看</el-button>
@@ -244,11 +250,16 @@
            <el-tab-pane label="设备检测" name="second">
                <el-button type="primary" size="default" :disabled="disabled" @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="testPersonName" label="检测人" />
                    <el-table-column align="center" prop="testDate" :formatter="timeDate" label="检测日期" />
                    <el-table-column align="center" prop="testPersonDepartmentId" label="检测人单位" />
                    <el-table-column align="center" prop="testPersonDepartmentName" label="检测人单位" />
                    <el-table-column align="center" prop="testMemo" label="检测内容" />
                    <el-table-column align="center" prop="testResult" label="检测结果" />
                    <el-table-column align="center" label="检测结果" >
                        <template #default="scope">
                            <span v-if="scope.row.testResult==1">成功</span>
                            <span v-if="scope.row.testResult==2">失败</span>
                        </template>
                    </el-table-column>
                    <el-table-column align="center" prop="testStatus" label="检测状态" />
                    <el-table-column align="center" label="操作">
                        <template #default="scope">
@@ -263,10 +274,15 @@
                <el-button type="primary" size="default" :disabled="disabled" @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="维修状态" />
                    <el-table-column align="center"  label="维修状态">
                    <template #default="scope">
                            <span v-if="scope.row.repairStatus==1">维修中</span>
                            <span v-if="scope.row.repairStatus==2">已修好</span>
                        </template>
                    </el-table-column>
                    <el-table-column align="center" prop="repairMemo" label="维修情况" />
                    <el-table-column align="center" prop="repairPersonId" label="维修负责人" />
                    <el-table-column align="center" prop="repairPersonDepartmentId" label="维修负责人单位" />
                    <el-table-column align="center" prop="repairPersonName" label="维修负责人" />
                    <el-table-column align="center" prop="repairPersonDepartmentName" label="维修负责人单位" />
                    <el-table-column align="center" prop="repairStartDate" :formatter="timeDate" label="维修开始日期" />
                    <el-table-column align="center" prop="repairEndDate" :formatter="timeDate" label="维修结束日期" />
                    <el-table-column align="center" label="操作">
@@ -701,7 +717,7 @@
        };
        // 回传
        const main = (data: any) => {
            let val = deepClone(data);
            const val = deepClone(data);
            if (index.value == -1) {
                form.value.takecareDetailList.push(val);
            } else {
@@ -709,7 +725,7 @@
            }
        };
        const delect = (data: any) => {
            let val = deepClone(data);
            const val = deepClone(data);
            if (index.value == -1) {
                form.value.testDetailList.push(val);
            } else {
@@ -717,7 +733,7 @@
            }
        };
        const Repair = (data: any) => {
            let val = deepClone(data);
            const val = deepClone(data);
            if (index.value == -1) {
                form.value.repaireDetailList.push(val);
            } else {
@@ -725,7 +741,7 @@
            }
        };
        const Stand = (data: any) => {
            let val = deepClone(data);
            const val = deepClone(data);
            if (index.value == -1) {
                form.value.checkStandardeDetailList.push(val);
            } else {
src/components/equipmentDailog/detectDailog.vue
@@ -55,7 +55,7 @@
            <span class="dialog-footer">
                <!-- <el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button> -->
                <el-button @click="resetForm(ruleFormRef)" size="default">关闭</el-button>
                <el-button type="primary" @click="submitForm(ruleFormRef)" size="default">确定</el-button>
                <el-button type="primary" @click="submitForm(ruleFormRef)" :disabled="disabled" size="default">确定</el-button>
            </span>
        </template>
    </el-dialog>
@@ -131,7 +131,7 @@
        //   取消
        const resetForm = (formEl: FormInstance | undefined) => {
            if (!formEl) return;
            formEl.resetFields();
            formEl.clearValidate();
            dialogVisible.value = false;
            disabled.value = false;
            form.value={}
src/components/equipmentDailog/maintenanceDailog.vue
@@ -19,12 +19,25 @@
            <el-row>
                <el-col :span="11">
                    <el-form-item label="保养日期" size="default" prop="takecareDate">
                        <el-date-picker v-model="form.takecareDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" style="width: 100%" />
                        <el-date-picker
                            v-model="form.takecareDate"
                            format="YYYY-MM-DD HH:mm:ss"
                            value-format="YYYY-MM-DD HH:mm:ss"
                            type="datetime"
                            style="width: 100%"
                        />
                    </el-form-item>
                </el-col>
                <el-col :span="11" :offset="2">
                    <el-form-item label="保养负责人单位" size="default" prop="leadingPersonDepartmentId">
                        <el-tree-select v-model="form.leadingPersonDepartmentId" :data="data" check-strictly="true" class="w100" :props="propse" placeholder="请选择" />
                        <el-tree-select
                            v-model="form.leadingPersonDepartmentId"
                            :data="data"
                            check-strictly="true"
                            class="w100"
                            :props="propse"
                            placeholder="请选择"
                        />
                    </el-form-item>
                </el-col>
            </el-row>
@@ -33,7 +46,7 @@
            <span class="dialog-footer">
                <!-- <el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button> -->
                <el-button @click="resetForms(ruleFormRefs)" size="default">关闭</el-button>
                <el-button type="primary" @click="submitForms(ruleFormRefs)" size="default">确定</el-button>
                <el-button type="primary" @click="submitForms(ruleFormRefs)" :disabled="disabled" size="default">确定</el-button>
            </span>
        </template>
    </el-dialog>
@@ -62,7 +75,7 @@
        const disabled = ref(false);
        const dialogVisible = ref(false);
        const openDailog = (title: string, data: any) => {
            department()
            department();
            dialogVisible.value = true;
            titles.value = `${title}仪器仪表`;
            if (title == '查看') {
@@ -128,10 +141,12 @@
        //   取消
        const resetForms = (formEl: FormInstance | undefined) => {
            if (!formEl) return;
            formEl.resetFields();
            dialogVisible.value = false;
            formEl.clearValidate();
            disabled.value = false;
            form.value={}
            form.value = {};
            dialogVisible.value = false;
        };
        //全屏
        const full = ref(false);
src/components/equipmentDailog/repairDailog.vue
@@ -76,7 +76,7 @@
            <span class="dialog-footer">
                <!-- <el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button> -->
                <el-button @click="resetForm(ruleFormRef)" size="default">关闭</el-button>
                <el-button type="primary"  @click="submitForm(ruleFormRef)" size="default">确定</el-button>
                <el-button type="primary"  @click="submitForm(ruleFormRef)" :disabled="disabled" size="default">确定</el-button>
            </span>
        </template>
    </el-dialog>
@@ -153,7 +153,7 @@
        //  取消
        const resetForm = (formEl: FormInstance | undefined) => {
            if (!formEl) return;
            formEl.resetFields();
            formEl.clearValidate();
            disabled.value = false;
            dialogVisible.value = false;
            form.value = {};
src/components/equipmentDailog/standardDailog.vue
@@ -110,7 +110,7 @@
        //   取消
        const resetForm = (formEl: FormInstance | undefined) => {
            if (!formEl) return;
            formEl.resetFields();
            formEl.clearValidate();
            dialogVisible.value = false;
            disabled.value = false;
            form.value = {};
src/views/facilityManagement/InstrumentationInformation/index.vue
@@ -45,14 +45,14 @@
                                    <el-tab-pane label="设备保养" name="first">
                                        <el-table ref="multipleTableRef" :data="scope.row.takecareDetailList" style="width: 100%">
                                            <el-table-column property="takecareMemo" align="center" label="保养情况" sortable />
                                            <el-table-column property="leadingPersonId" align="center" label="保养负责人" sortable />
                                            <el-table-column property="leadingPersonName" align="center" label="保养负责人" sortable />
                                            <el-table-column property="takecareDate" align="center" :formatter="timeDate" label="保养日期" sortable />
                                            <el-table-column property="leadingPersonDepartmentId" align="center" label="保养负责人单位" sortable />
                                            <el-table-column property="leadingPersonDepartmentName" align="center" label="保养负责人单位" sortable />
                                        </el-table>
                                    </el-tab-pane>
                                    <el-tab-pane label="设备检查" name="second"
                                        ><el-table ref="multipleTableRef" :data="scope.row.checkDetailList" style="width: 100%">
                                            <el-table-column property="leadingPersonId" align="center" label="检查人" sortable />
                                            <el-table-column property="leadingPersonName" align="center" label="检查人" sortable />
                                            <el-table-column property="createTime" align="center" :formatter="timeDate" label="检查日期" sortable />
                                            <el-table-column property="name" align="center" label="检查人部门" sortable />
                                            <el-table-column property="takecareMemo" align="center" label="检查结果" sortable />
@@ -60,21 +60,31 @@
                                    ></el-tab-pane>
                                    <el-tab-pane label="设备检测" name="third">
                                        <el-table ref="multipleTableRef" :data="scope.row.testDetailList" style="width: 100%">
                                            <el-table-column property="testPersonId" align="center" label="检测人" sortable />
                                            <el-table-column property="testPersonName" align="center" label="检测人" sortable />
                                            <el-table-column property="testDate" align="center" :formatter="timeDate" label="检测日期" sortable />
                                            <el-table-column property="testPersonDepartmentId" align="center" label="检测人单位" sortable />
                                            <el-table-column property="testPersonDepartmentName" 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 align="center" label="检测结果">
                                                <template #default="scope">
                                                    <span v-if="scope.row.testResult == 1">成功</span>
                                                    <span v-if="scope.row.testResult == 2">失败</span>
                                                </template>
                                            </el-table-column>
                                            <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="exceptionInfo" align="center" label="设施异常项" sortable />
                                            <el-table-column property="repairStatus" align="center" label="维修状态" sortable />
                                            <el-table-column align="center" label="维修状态">
                                                <template #default="scope">
                                                    <span v-if="scope.row.repairStatus == 1">维修中</span>
                                                    <span v-if="scope.row.repairStatus == 2">已修好</span>
                                                </template>
                                            </el-table-column>
                                            <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="repairPersonName" align="center" label="维修负责人" sortable />
                                            <el-table-column property="repairPersonDepartmentName" align="center" label="维修负责人单位" sortable />
                                            <el-table-column property="repairStartDate" align="center" :formatter="timeDate" label="维修开始日期" sortable />
                                            <el-table-column property="repairEndDate" align="center" :formatter="timeDate" label="维修结束日期" sortable />
                                        </el-table>
@@ -136,6 +146,7 @@
            searchParams: {
                qName: '', ////名称
                positionNum: '', ////位号
                equipmentTypeId: '',
                infoType: 0, ////具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施
            },
        });
@@ -188,8 +199,8 @@
        };
        // 删除
        const onDelete = (id: number) => {
            let arr=[]
            arr.push(id)
            let arr = [];
            arr.push(id);
            ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
                confirmButtonText: '确定',
                cancelButtonText: '取消',
@@ -227,7 +238,7 @@
            for (let i = 0; i < valId.length; i++) {
                arr.push(valId[i].id);
            }
            deletAll.value = arr
            deletAll.value = arr;
            if (val.length == 1) {
                warning.value = false;
                danger.value = false;
@@ -300,6 +311,7 @@
        };
        const handleNodeClick = (data: Tree) => {
            ruleForm.searchParams.positionNum = data.sortNum;
            ruleForm.searchParams.equipmentTypeId = data.id;
            listApi();
        };
        const data = ref([]);
src/views/facilityManagement/ProductionEquipment/index.vue
@@ -46,14 +46,14 @@
                                    <el-tab-pane label="设备保养" name="first">
                                        <el-table ref="multipleTableRef" :data="scope.row.takecareDetailList" style="width: 100%">
                                            <el-table-column property="takecareMemo" align="center" label="保养情况" sortable />
                                            <el-table-column property="leadingPersonId" align="center" label="保养负责人" sortable />
                                            <el-table-column property="leadingPersonName" align="center" label="保养负责人" sortable />
                                            <el-table-column property="takecareDate" align="center" label="保养日期" sortable />
                                            <el-table-column property="leadingPersonDepartmentId" align="center" label="保养负责人单位" sortable />
                                            <el-table-column property="leadingPersonDepartmentName" align="center" label="保养负责人单位" sortable />
                                        </el-table>
                                    </el-tab-pane>
                                    <el-tab-pane label="设备检查" name="second"
                                        ><el-table ref="multipleTableRef" :data="scope.row.checkDetailList" style="width: 100%">
                                            <el-table-column property="leadingPersonId" align="center" label="检查人" sortable />
                                            <el-table-column property="leadingPersonName" align="center" label="检查人" sortable />
                                            <el-table-column property="createTime" align="center" label="检查日期" sortable />
                                            <el-table-column property="name" align="center" label="检查人部门" sortable />
                                            <el-table-column property="takecareMemo" align="center" label="检查结果" sortable />
@@ -61,21 +61,31 @@
                                    ></el-tab-pane>
                                    <el-tab-pane label="设备检测" name="third">
                                        <el-table ref="multipleTableRef" :data="scope.row.testDetailList" style="width: 100%">
                                            <el-table-column property="testPersonId" align="center" label="检测人" sortable />
                                            <el-table-column property="testPersonName" 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="testPersonDepartmentName" 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 align="center" label="检测结果">
                                                <template #default="scope">
                                                    <span v-if="scope.row.testResult == 1">成功</span>
                                                    <span v-if="scope.row.testResult == 2">失败</span>
                                                </template>
                                            </el-table-column>
                                            <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="exceptionInfo" align="center" label="设施异常项" sortable />
                                            <el-table-column property="repairStatus" align="center" label="维修状态" sortable />
                                            <el-table-column align="center" label="维修状态">
                                                <template #default="scope">
                                                    <span v-if="scope.row.repairStatus == 1">维修中</span>
                                                    <span v-if="scope.row.repairStatus == 2">已修好</span>
                                                </template>
                                            </el-table-column>
                                            <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="repairPersonName" align="center" label="维修负责人" sortable />
                                            <el-table-column property="repairPersonDepartmentName" align="center" label="维修负责人单位" sortable />
                                            <el-table-column property="repairStartDate" align="center" label="维修开始日期" sortable />
                                            <el-table-column property="repairEndDate" align="center" label="维修结束日期" sortable />
                                        </el-table>
@@ -136,6 +146,7 @@
            searchParams: {
                qName: '', ////名称
                positionNum: '', ////位号
                equipmentTypeId:"",
                infoType: 1, ////具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施
            },
        });
@@ -299,7 +310,8 @@
            return data.typeName.includes(value);
        };
       const handleNodeClick=(data: Tree)=>{
            ruleForm.searchParams.positionNum=data.sortNum
            ruleForm.searchParams.equipmentTypeId=data.id
            ruleForm.searchParams.equipmentTypeId = data.id;
            listApi();
       }
        const data=ref([])
src/views/facilityManagement/deviceType/component/Dailog.vue
@@ -152,11 +152,13 @@
                    console.log('error submit!', fields);
                }
            });
            disabled.value=false
        };
        const resetForm = (formEl: FormInstance | undefined) => {
            if (!formEl) return;
            formEl.resetFields();
            dialogVisible.value = false;
            disabled.value=false
        };
        //全屏
        const full = ref(false);
src/views/facilityManagement/safetyEquipment/index.vue
@@ -19,7 +19,6 @@
            <el-col :span="4">
            <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>
@@ -46,14 +45,14 @@
                                    <el-tab-pane label="设备保养" name="first">
                                        <el-table ref="multipleTableRef" :data="scope.row.takecareDetailList" style="width: 100%">
                                            <el-table-column property="takecareMemo" align="center" label="保养情况" sortable />
                                            <el-table-column property="leadingPersonId" align="center" label="保养负责人" sortable />
                                            <el-table-column property="leadingPersonName" align="center" label="保养负责人" sortable />
                                            <el-table-column property="takecareDate" align="center" :formatter="timeDate" label="保养日期" sortable />
                                            <el-table-column property="leadingPersonDepartmentId" align="center" label="保养负责人单位" sortable />
                                            <el-table-column property="leadingPersonDepartmentName" align="center" label="保养负责人单位" sortable />
                                        </el-table>
                                    </el-tab-pane>
                                    <el-tab-pane label="设备检查" name="second"
                                        ><el-table ref="multipleTableRef" :data="scope.row.checkDetailList" style="width: 100%">
                                            <el-table-column property="leadingPersonId" align="center" label="检查人" sortable />
                                            <el-table-column property="leadingPersonName" align="center" label="检查人" sortable />
                                            <el-table-column property="createTime" align="center" :formatter="timeDate" label="检查日期" sortable />
                                            <el-table-column property="name" align="center" label="检查人部门" sortable />
                                            <el-table-column property="takecareMemo" align="center" label="检查结果" sortable />
@@ -61,21 +60,31 @@
                                    ></el-tab-pane>
                                    <el-tab-pane label="设备检测" name="third">
                                        <el-table ref="multipleTableRef" :data="scope.row.testDetailList" style="width: 100%">
                                            <el-table-column property="testPersonId" align="center" label="检测人" sortable />
                                            <el-table-column property="testPersonName" align="center" label="检测人" sortable />
                                            <el-table-column property="testDate" align="center" :formatter="timeDate" label="检测日期" sortable />
                                            <el-table-column property="testPersonDepartmentId" align="center" label="检测人单位" sortable />
                                            <el-table-column property="testPersonDepartmentName" 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 align="center" label="检测结果">
                                                <template #default="scope">
                                                    <span v-if="scope.row.testResult == 1">成功</span>
                                                    <span v-if="scope.row.testResult == 2">失败</span>
                                                </template>
                                            </el-table-column>
                                            <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="exceptionInfo" align="center" label="设施异常项" sortable />
                                            <el-table-column property="repairStatus" align="center" label="维修状态" sortable />
                                            <el-table-column align="center" label="维修状态">
                                                <template #default="scope">
                                                    <span v-if="scope.row.repairStatus == 1">维修中</span>
                                                    <span v-if="scope.row.repairStatus == 2">已修好</span>
                                                </template>
                                            </el-table-column>
                                            <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="repairPersonName" align="center" label="维修负责人" sortable />
                                            <el-table-column property="repairPersonDepartmentName" align="center" label="维修负责人单位" sortable />
                                            <el-table-column property="repairStartDate" align="center" :formatter="timeDate" label="维修开始日期" sortable />
                                            <el-table-column property="repairEndDate" align="center" :formatter="timeDate" label="维修结束日期" sortable />
                                        </el-table>
@@ -121,7 +130,7 @@
import Dailog from '/@/components/equipmentDailog/Dailog.vue';
import { ElTree, TabsPaneContext, ElMessage, ElMessageBox } from 'element-plus';
import { facilityManagementApi } from '/@/api/facilityManagement';
import {timeDate} from '/@/assets/index.ts'
import { timeDate } from '/@/assets/index.ts';
import { EditPen, View, Plus, Delete, Download, Refresh, Upload } from '@element-plus/icons-vue';
interface Tree {
    label: string;
@@ -137,6 +146,7 @@
            searchParams: {
                qName: '', ////名称
                positionNum: '', ////位号
                equipmentTypeId: '',
                infoType: 2, ////具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施
            },
        });
@@ -189,8 +199,8 @@
        };
        // 删除
        const onDelete = (id: number) => {
            let arr=[]
            arr.push(id)
            let arr = [];
            arr.push(id);
            ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
                confirmButtonText: '确定',
                cancelButtonText: '取消',
@@ -228,7 +238,7 @@
            for (let i = 0; i < valId.length; i++) {
                arr.push(valId[i].id);
            }
            deletAll.value = arr
            deletAll.value = arr;
            if (val.length == 1) {
                warning.value = false;
                danger.value = false;
@@ -290,7 +300,7 @@
            label: 'typeName',
            children: 'childList',
            value: 'id',
        }
        };
        watch(filterText, (val) => {
            treeRef.value!.filter(val);
        });
@@ -300,10 +310,11 @@
            return data.typeName.includes(value);
        };
       const handleNodeClick=(data: Tree)=>{
            ruleForm.searchParams.positionNum=data.sortNum
            ruleForm.searchParams.equipmentTypeId = data.id;
            ruleForm.searchParams.equipmentTypeId = data.id;
            listApi();
       }
        const data=ref([])
        };
        const data = ref([]);
        onMounted(() => {
            listApiTree();
        });