应急系统修改

zhaojiale

2022-08-10 8fa7c89cc1dbde33485260b674c1145d4e352366

应急系统修改

 src/components/equipmentDailog/DailogS.vue

@@ -141,9 +141,9 @@
                <el-button type="primary" size="default" @click="openMaintenance('新增', '')" :disabled="disabled">新增</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="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" :disabled="disabled">查看</el-button>
@@ -155,12 +155,17 @@
            </el-tab-pane>
            <el-tab-pane label="设备检测" name="second">
                <el-button type="primary" size="default" @click="openDetect('新增', '')" :disabled="disabled">新增</el-button>
                <el-table :data="form.testDetailList" style="width: 100%">
                    <el-table-column align="center" prop="testPersonId" label="检测人" />
                <el-table :data="form.checkDetailList" style="width: 100%">
                    <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" prop="testResult" 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">
@@ -175,10 +180,15 @@
                <el-button type="primary" size="default" @click="openRepair('新增', '')" :disabled="disabled">新增</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" prop="repairStatus" 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="操作">
@@ -193,7 +203,7 @@
            <el-tab-pane label="检查标准设置" name="fourth">
                <el-button type="primary" size="default" @click="openStandard('新增', '')" :disabled="disabled">新增</el-button>
                <el-table :data="form.checkStandardeDetailList" style="width: 100%">
                    <el-table-column align="center" type="indexNum" 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="单位" />
@@ -282,16 +292,16 @@
      inputPersonName: '',
            departmentId: '',

            delRepaireDetailList: [],
            // delRepaireDetailList: [],

            delTestDetailList: [],
            // delTestDetailList: [],

            takecareDetailList: [],
            checkDetailList: [],

            responsibilityPersonId: '',
      responsibilityPersonName: '',
            delTakecareStardardeDetailList: [],
            // delTakecareStardardeDetailList: [],

            connectPersonId: '',
      connectPersonName: '',
@@ -313,13 +323,13 @@
            testDetailList: [],
            checkCycle: '',
            repaireDetailList: [],
            delCheckStandardeDetailList: [],
            // delCheckStandardeDetailList: [],

            leadingPersonName: '',

            name: '',

            delTakecareDetailList: [],
            // delTakecareDetailList: [],

            position: '',

@@ -380,6 +390,7 @@
            dialogVisible.value = false;
      if (titleT.value == '新建') {
        delete form.value.id;
        delete form.value.infoTpe
      }
            facilityManagementApi()
                .getkeypointEquipmentInfoAddOrUpdate(form.value)
@@ -397,8 +408,11 @@
            // form.value = null;
        };
        //   取消
        const resetForm = () => {
        const resetForm = (formEl: FormInstance | undefined) => {
            if (!formEl) return;
            formEl.resetFields();
            dialogVisible.value = false;
            form.value={}
        };
        const activeName = ref('first');
        const index = ref<any>();

 src/components/equipmentDailog/repairDailog.vue

@@ -132,7 +132,7 @@
            exceptionInfo: [{ required: true, message: '设施异常项不能为空', trigger: 'blur' }],
            repairStatus: [{ required: true, message: '维修状态不能为空', trigger: 'blur' }],
            repairMemo: [{ required: true, message: '维修情况不能为空', trigger: 'blur' }],
            repairPersonName: [{ required: true, message: '维修负责人不能为空', trigger: 'blur' }],
            // repairPersonName: [{ required: true, message: '维修负责人不能为空', trigger: 'blur' }],
            repairPersonDepartmentId: [{ required: true, message: '维修负责人单位不能为空', trigger: 'blur' }],
            repairStartDate: [{ required: true, message: '维修开始日期不能为空', trigger: 'blur' }],
            repairEndDate: [{ required: true, message: '维修结束日期不能为空', trigger: 'blur' }],

 src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/regionsDialog.vue

@@ -1,5 +1,5 @@
<template>
  <el-dialog v-model="dialogVisible" title="选择应急预案" width="900px" draggable :fullscreen="full">
  <el-dialog v-model="dialogVisible" title="选择应急预案" width="900px" draggable :fullscreen="full" @close="closeDialog">
    <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
    <el-row>
      <el-col :span="18">
@@ -132,6 +132,9 @@
      dynamicTags.value.splice(dynamicTags.value.indexOf(tag), 1);
      radio1.value = '';
    };
    const closeDialog = () =>{
      handleClose('')
    }
    const radio1 = ref('');
    const radio = (event: any) => {
      dynamicTags.value[0] = event;
@@ -175,6 +178,7 @@
      listQuery,
      onSubmit,
      submitForm,
      closeDialog
    };
  },
});

 src/views/facilityManagement/keyEquipment/index.vue

@@ -4,7 +4,7 @@
            <el-row>
                <el-col :span="4">
                    <el-form-item size="default">
                        <el-input v-model="ruleForm.qName" placeholder="装置/部位名称" />
                        <el-input v-model="ruleForm.searchParams.name" placeholder="装置/部位名称"/>
                    </el-form-item>
                </el-col>
                <el-col :span="4">
@@ -20,7 +20,8 @@
                <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" :data="data" :props="props" @node-click="handleNodeClick" :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">
@@ -28,7 +29,9 @@
                    <div>
                        <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>
                        <el-button size="default" :disabled="danger" type="danger" :icon="Delete" @click="onDeleteAll"
                                   plain>删除
                        </el-button>
                    </div>
                    <div>
                        <!-- <el-button size="default" :icon="Upload" @click="openUp"></el-button>
@@ -37,67 +40,116 @@
                    </div>
                </div>
                <div style="padding-left: 10px">
                    <el-table ref="multipleTableRef" :data="tableData" @selection-change="handleSelectionChange" style="width: 100%">
                    <el-table ref="multipleTableRef" :data="tableData" @selection-change="handleSelectionChange"
                              style="width: 100%">
                        <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="handleClick" style="margin: 0 5%">
                                <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick"
                                         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="takecareMemo" align="center" label="保养情况" sortable />
                                            <el-table-column property="leadingPersonId" 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 ref="multipleTableRef" :data="scope.row.takecareDetailList"
                                                  style="width: 100%">
                                            <el-table-column property="takecareMemo" 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="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="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 />
                                            <el-table-column property="name" align="center" label="检查状态" sortable /> </el-table
                                    ></el-tab-pane>
                                    >
                                        <el-table ref="multipleTableRef" :data="scope.row.checkDetailList"
                                                  style="width: 100%">
                                            <el-table-column property="testPersonName" align="center" label="检查人"
                                                             sortable/>
                                            <el-table-column property="testDate" align="center" :formatter="timeDate"
                                                             label="检查日期" sortable/>
                                            <el-table-column property="testPersonDepartmentName" align="center" label="检查人部门" sortable/>
                                            <el-table-column property="testResult" align="center" label="检查结果"
                                                             sortable>
                                                <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="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="testDate" align="center" :formatter="timeDate" label="检测日期" sortable />
                                            <el-table-column property="testPersonDepartmentId" align="center" label="检测人单位" sortable />
                                        <el-table ref="multipleTableRef" :data="scope.row.testDetailList"
                                                  style="width: 100%">
                                            <el-table-column property="repairPersonName" align="center" label="检测人"
                                                             sortable/>
                                            <el-table-column property="repairStarDate" align="center" :formatter="timeDate"
                                                             label="检测日期" sortable/>
                                            <el-table-column property="repairPersonDepartmentName" 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-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="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" :formatter="timeDate" label="维修开始日期" sortable />
                                            <el-table-column property="repairEndDate" align="center" :formatter="timeDate" label="维修结束日期" sortable />
                                        <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>
                                                <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="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>
                                    </el-tab-pane>
                                </el-tabs>
                            </template>
                        </el-table-column>
                        <el-table-column property="equipmentTypeId" align="center" label="类型/类别外键" sortable />
                        <el-table-column property="equipmentTypeName" align="center" label="类型/类别外键" sortable/>
                        <el-table-column property="name" align="center" label="装置/部位名称" sortable />
                        <el-table-column property="departmentId" label="所属部门" align="center" sortable show-overflow-tooltip />
                        <el-table-column property="position" label="具体位置" align="center" sortable show-overflow-tooltip />
                        <el-table-column property="leadingPersonName" label="负责人姓名" align="center" sortable show-overflow-tooltip />
                        <el-table-column property="connectPersonId" label="装置部位分类" align="center" sortable show-overflow-tooltip>
                        <el-table-column property="departmentName" label="所属部门" align="center" sortable
                                         show-overflow-tooltip/>
                        <el-table-column property="position" label="具体位置" align="center" sortable
                                         show-overflow-tooltip/>
                        <el-table-column property="leadingPersonName" label="负责人姓名" align="center" sortable
                                         show-overflow-tooltip/>
                        <el-table-column property="partType" label="装置部位分类" align="center" sortable
                                         show-overflow-tooltip>
              <template #default="scope">
                <span v-if="scope.row.type == 1">关键装置</span>
                <span v-if="scope.row.type == 2">重点部位</span>
                                <span v-if="scope.row.partType == 1">关键装置</span>
                                <span v-if="scope.row.partType == 2">重点部位</span>
              </template>
            </el-table-column>
                        <el-table-column label="操作" align="center" width="250">
                            <template #default="scope">
                                <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>
                                <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>
                    </el-table>
@@ -127,10 +179,12 @@
import { EditPen, Plus, Delete, Download, Refresh, Upload, View } from '@element-plus/icons-vue';
import { facilityManagementApi } from '/@/api/facilityManagement';
import {timeDate} from '/@/assets/index.ts'

interface Tree {
    label: string;
    children?: Tree[];
}

export default defineComponent({
    components: {
        // updata,
@@ -142,7 +196,7 @@
            pageIndex: 1,
            searchParams: {
                // equipmentTypeId: '', ////类型/类别外键
        // qName: '', ////装置/部位名称
                    name: '', ////装置/部位名称
                // departmentId: '',////所属部门
                // position: '', ////具体位置
                // leadingPersonName: '', ////负责人姓名
@@ -153,11 +207,11 @@
        });
        // 重置
        const resetForm = () => {
            ruleForm.qName = '';
      ruleForm.searchParams.equipmentTypeId = '';
            listApi();
        };
        const listApi = () => {
                // delete ruleForm.qName
            facilityManagementApi()
                .getkeypointEquipmentInfoAddOrList(ruleForm)
                .then((res) => {
@@ -376,12 +430,14 @@
    padding: 20px 0px 20px 0px;
    margin-bottom: 10px;
}

.tree {
    height: 750px;
    background-color: #fff;
    overflow: hidden;
    overflow-y: auto;
}

.btns {
    padding: 10px 0px 10px 10px;
    display: flex;