Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut

shj

2022-08-09 c64c8f43ec1a3d88feb1f915fd488040b6358e7d

 src/components/equipmentDailog/DailogS.vue

@@ -5,16 +5,16 @@
         <el-row>
            <el-col :span="11">
               <el-form-item label="类型/类别外键" size="default" prop="equipmentTypeId">
                  <el-input v-model="form.equipmentTypeId" placeholder="请选择">
                  <el-input v-model="form.equipmentTypeName" placeholder="请选择">
                     <template #append>
                        <el-button :icon="Search" @click="opencategory" disabled></el-button>
                        <el-button :icon="Search" @click="opencategory"></el-button>
                     </template>
                  </el-input>
               </el-form-item>
            </el-col>
            <el-col :span="11" :offset="2">
               <el-form-item label="装置/部位名称" size="default">
                  <el-input v-model="form.name" placeholder="请选择" />
                  <el-input v-model="form.name" placeholder="请填写装置/部位名称" />
               </el-form-item>
            </el-col>
         </el-row>
@@ -72,21 +72,21 @@
            <el-col :span="11">
               <el-form-item label="装置部位分类" size="default">
                  <el-select v-model="form.partType" placeholder="请选择" style="width: 100%">
                     <el-option label="关键装置" value="关键装置" />
                     <el-option label="重点部位" value="重点部位" />
                     <el-option label="关键装置" value="1" />
                     <el-option label="重点部位" value="2" />
                  </el-select>
               </el-form-item>
            </el-col>
            <el-col :span="11" :offset="2">
               <el-form-item label="检查周期" size="default">
                  <el-input v-model="form.checkCycle" placeholder="请选择检查周期" />
                  <el-input v-model="form.checkCycle" placeholder="请填写检查周期" />
               </el-form-item>
            </el-col>
         </el-row>
         <el-row>
            <el-col :span="11">
               <el-form-item label="相关应急预案" size="default">
                  <el-input v-model="form.emergencePlanId" placeholder="请选择">
                  <el-input v-model="form.emergencePlanName" placeholder="请选择">
                     <template #append>
                        <el-button :icon="Search" @click="openPlan"></el-button>
                     </template>
@@ -95,21 +95,20 @@
            </el-col>
            <el-col :span="11" :offset="2">
               <el-form-item label="主要危险有害因素" size="default">
                  <el-input v-model="form.dangerousElement" placeholder="请选择" />
                  <el-input v-model="form.dangerousElement" placeholder="请填写主要危险有害因素" />
               </el-form-item>
            </el-col>
         </el-row>

         <el-row>
            <el-col :span="11">
               <el-form-item label="易导致风险" size="default">
                  <el-input v-model="form.toDangerous" placeholder="请选择易导致风险" />
                  <el-input v-model="form.toDangerous" placeholder="请填写易导致风险" />
               </el-form-item>
            </el-col>

            <el-col :span="11" :offset="2">
               <el-form-item label="应急处置措施" size="default">
                  <el-input v-model="form.treatment" placeholder="请选择应急处置措施" />
                  <el-input v-model="form.treatment" placeholder="请填写应急处置措施" />
               </el-form-item>
            </el-col>
         </el-row>
@@ -133,7 +132,7 @@
         </el-row>
         <el-row>
            <el-col :span="11">
               <el-form-item label="备注信息" size="default"> <el-input v-model="form.name" placeholder="请选择应急处置措施" /> </el-form-item>
               <el-form-item label="备注信息" size="default"> <el-input v-model="form.name" placeholder="请填写备注信息" /> </el-form-item>
            </el-col>
         </el-row>
      </el-form>
@@ -246,7 +245,7 @@
         </span>
      </template>
   </el-dialog>
   <categoryDailog ref="categoryShow"></categoryDailog>
   <categoryDailog ref="categoryShow" @typeId="Tid"></categoryDailog>
   <RegionsDialog ref="planShow" @SearchUser="onUser"></RegionsDialog>
   <DailogSearchUser ref="UserShow" @SearchUser="userId"></DailogSearchUser>
   <maintenanceDailog ref="maintenanceShow" @onMain="main"></maintenanceDailog>
@@ -269,13 +268,14 @@
import type { UploadProps, UploadUserFile } from 'element-plus';
import { facilityManagementApi } from '/@/api/facilityManagement';
import { goalManagementApi } from '/@/api/goalManagement';
import {deepClone} from '/@/utils/other'
export default defineComponent({
   components: { categoryDailog, RegionsDialog, DailogSearchUser, maintenanceDailog, detectDailog, repairDailog, standardDailog },
   setup(props, { emit }) {
      const dialogVisible = ref(false);
      const form = ref({
         equipmentTypeId: 1,

      equipmentTypeName:"",
         treatment: '',

         inputPersonId: '',
@@ -322,7 +322,8 @@

         position: '',

         emergencePlanId: '',
      emergencePlanId: '',
      emergencePlanName:'',

         checkStandardeDetailList: [],
         infoTpe: '',
@@ -407,6 +408,7 @@
      };
      const onUser = (e: any) => {
         form.value.emergencePlanId = e.id;
      form.value.emergencePlanName=e.name
      };

      const UserShow = ref();
@@ -425,6 +427,10 @@
            form.value.responsibilityPersonName = val.realName;
         }
      };
    const Tid=(data:any)=>{
      form.value.equipmentTypeId=data.id
      form.value.equipmentTypeName=data.typeName
    }
      const maintenanceShow = ref();
      const openMaintenance = (title: string, data: any) => {
         index.value = form.value.takecareDetailList.indexOf(data);
@@ -497,28 +503,32 @@
         deleteDId.value.push(tag.id);
      };
      // 回传
      const main = (val: any) => {
      const main = (data: any) => {
      let val=deepClone(data)
         if (index.value == -1) {
            form.value.takecareDetailList.push(val);
         } else {
            form.value.takecareDetailList[index.value] = val;
         }
      };
      const delect = (val: any) => {
      const delect = (data: any) => {
      let val=deepClone(data)
         if (index.value == -1) {
            form.value.testDetailList.push(val);
         } else {
            form.value.testDetailList[index.value] = val;
         }
      };
      const Repair = (val: any) => {
      const Repair = (data: any) => {
      let val=deepClone(data)
         if (index.value == -1) {
            form.value.repaireDetailList.push(val);
         } else {
            form.value.repaireDetailList[index.value] = val;
         }
      };
      const Stand = (val: any) => {
      const Stand = (data: any) => {
      let val=deepClone(data)
         if (index.value == -1) {
            form.value.checkStandardeDetailList.push(val);
         } else {
@@ -526,9 +536,8 @@
         }
      };
    const rules = reactive<FormRules>({
      equipmentTypeId: {

      }
      equipmentTypeId: [],
      equipmentTypeName:[],
    })
      //图片提交
      const imageUrl = ref('');
@@ -622,6 +631,7 @@
         full,
         toggleFullscreen,
         FullScreen,
      Tid,
         resetForm,
         deleteAId,
         deleteBId,