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

shj

2022-08-03 96103611f97b412453ecf0948792987956e4f29f

 src/components/equipmentDailog/DailogS.vue

@@ -150,12 +150,14 @@
               <el-table-column align="center" label="操作">
                  <template #default="scope">
                     <el-button link type="primary" @click="openMaintenance('查看', scope.row)" size="small">查看</el-button>
              <el-button link type="primary" @click="openMaintenance('修改', scope.row)" size="small">修改</el-button>
              <el-button link type="primary" @click="deleteA(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="检测日期" />
@@ -164,14 +166,16 @@
               <el-table-column align="center" prop="testResult" label="检测结果" />
               <el-table-column align="center" prop="testStatus" label="检测状态" />
               <el-table-column align="center" label="操作">
                  <template #default>
                  <template #default="scope">
                     <el-button link type="primary" @click="openDetect('查看', scope.row)" size="small">查看</el-button>
              <el-button link type="primary" @click="openDetect('修改', scope.row)" size="small">修改</el-button>
              <el-button link type="primary" @click="deleteB(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="维修状态" />
@@ -183,13 +187,15 @@
               <el-table-column align="center" label="操作">
                  <template #default="scope">
                     <el-button link type="primary" @click="openRepair('查看', scope.row)" size="small">查看</el-button>
              <el-button link type="primary" @click="openRepair('修改', scope.row)" size="small">修改</el-button>
              <el-button link type="primary" @click="deleteC(scope.row)" size="small">删除</el-button>
                  </template>
               </el-table-column>
            </el-table>
         </el-tab-pane>
         <el-tab-pane label="检查标准设置" name="fourth"
            >checkContent
            <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="indexNum" label="序号" width="75" />
               <el-table-column align="center" prop="checkContent" label="检查内容" />
@@ -200,6 +206,8 @@
               <el-table-column align="center" label="操作">
                  <template #default="scope">
                     <el-button link type="primary" @click="openStandard('查看', scope.row)" size="small">查看</el-button>
              <el-button link type="primary" @click="openStandard('修改', scope.row)" size="small">修改</el-button>
              <el-button link type="primary" @click="deleteD(scope.row)" size="small">删除</el-button>
                  </template>
               </el-table-column>
            </el-table>
@@ -267,13 +275,13 @@
   setup(props, { emit }) {
      const dialogVisible = ref(false);
      const form = ref({
         equipmentTypeId: '3',
         equipmentTypeId: '',

         treatment: '发生的',
         treatment: '',

         inputPersonId: 0,
         inputPersonId: '',

         departmentId: 0,
         departmentId: '',

         delRepaireDetailList: [],

@@ -294,89 +302,89 @@
         ],
      checkDetailList: [],

      responsibilityPersonId: 0,
      responsibilityPersonId: '',

      delTakecareStardardeDetailList: [],

      connectPersonId: 0,
      connectPersonId: '',

      scenePic: '',

      partType: 0,
      partType: '',

      toDangerous: '份12',
      toDangerous: '',

      dangerousElement: '',

      takecareStardardeDetailList: [
            {
               filePath: '123',
               filePath: '',
            },
         ],
      testDetailList: [
            {
          testMemo: '',

          testPersonDepartmentId: 0,
          testPersonDepartmentId: '',

          testStatus: '',

          testPersonId: 0,
          testPersonId: '',

          testResult: 0,
          testResult: '',

          testDate: 1658284314185 ,
          testDate: '' ,
            },
         ],
      checkCycle: '',
      repaireDetailList: [
            {
          repairStatus: 0,
          repairPersonDepartmentId: 0,
          repairStatus: '',
          repairPersonDepartmentId: '',
          repairMemo: '',
          infoTpe: 0,
          repairPersonId: 0,
          repairEndDate: 1658284314184,
          repairStartDate: 1658284314184,
          infoTpe: '',
          repairPersonId: '',
          repairEndDate: '',
          repairStartDate: '',
          exceptionInfo: '',
            },
         ],
      delCheckStandardeDetailList: [],

      leadingPersonName: '312',
      leadingPersonName: '',

      name: '3123',
      name: '',

         delTakecareDetailList: [],

      position: '312',
      position: '',

      emergencePlanId: 0,

      checkStandardeDetailList: [
            {
          indexNum: '1',
          indexNum: '',

          checkTarget: '3',
          checkTarget: '',

          checkPart: '5',
          checkPart: '',

          checkContent: '2',
          checkContent: '',

          unit: '4',
          unit: '',

          rate: '6',
          rate: '',
            },
         ],
      delCheckStandardeDetails: '1,2',
      delCheckStandardeDetails: '',

      delTakecareStardardeDetails: '1,2',
      delTakecareStardardeDetails: '',

      delTakecareDetails: '1,2',
      delTakecareDetails: '',

      delRepaireDetails: '1,2',
      delRepaireDetails: '',

      delTestDetails: '1,2',
      delTestDetails: '',
      });
    const titles = ref();
    const disabled = ref(false);
@@ -406,6 +414,10 @@
      };
    // 提交
    const submitForm = () => {
      form.value.delTakecareDetails =deleteAId.value.toString()
      form.value.delTestDetails =deleteBId.value.toString()
      form.value.delRepaireDetails =deleteCId.value.toString()
      form.value.delCheckStandardeDetails =deleteDId.value.toString()
      dialogVisible.value = false;
      facilityManagementApi()
          .getkeypointEquipmentInfoAddOrUpdate(form.value)
@@ -427,34 +439,11 @@
      dialogVisible.value = false;
    };
      const activeName = ref('first');

    const index = ref<any>();
    const categoryShow = ref();
    const opencategory = () => {
      categoryShow.value.openDailog();
    };

      const tableData = [
         {
            date: '2016-05-03',
            name: 'Tom',
            address: 'No. 189, Grove St, Los Angeles',
         },
         {
            date: '2016-05-02',
            name: 'Tom',
            address: 'No. 189, Grove St, Los Angeles',
         },
         {
            date: '2016-05-04',
            name: 'Tom',
            address: 'No. 189, Grove St, Los Angeles',
         },
         {
            date: '2016-05-01',
            name: 'Tom',
            address: 'No. 189, Grove St, Los Angeles',
         },
      ];

      const planShow = ref();
      const openPlan = () => {
@@ -466,18 +455,22 @@
      };
      const maintenanceShow = ref();
      const openMaintenance = (title: string, data: any) => {
      index.value = form.value.takecareDetailList.indexOf(data);
         maintenanceShow.value.openDailog(title, data);
      };
      const detectShow = ref();
      const openDetect = (title: string, data: any) => {
      index.value = form.value.testDetailList.indexOf(data);
         detectShow.value.openDailog(title, data);
      };
      const repairShow = ref();
      const openRepair = (title: string, data: any) => {
      index.value = form.value.repaireDetailList.indexOf(data);
         repairShow.value.openDailog(title, data);
      };
      const standardShow = ref();
      const openStandard = (title: string, data: any) => {
      index.value = form.value.checkStandardeDetailList.indexOf(data);
         standardShow.value.openDailog(title, data);
      };
      // 上传
@@ -510,18 +503,55 @@
            () => false
         );
      };
    const deleteAId = ref([]);
    const deleteBId = ref([]);
    const deleteCId = ref([]);
    const deleteDId = ref([]);
    // 删除
    const deleteA = (tag: any) => {
      form.value.takecareDetailList.splice(form.value.takecareDetailList.indexOf(tag), 1);
      deleteAId.value.push(tag.id);
    };
    const deleteB = (tag: any) => {
      form.value.testDetailList.splice(form.value.testDetailList.indexOf(tag), 1);
      deleteBId.value.push(tag.id);
    };
    const deleteC = (tag: any) => {
      form.value.repaireDetailList.splice(form.value.repaireDetailList.indexOf(tag), 1);
      deleteCId.value.push(tag.id);
    };
    const deleteD = (tag: any) => {
      form.value.checkStandardeDetailList.splice(form.value.checkStandardeDetailList.indexOf(tag), 1);
      deleteDId.value.push(tag.id);
    };
    // 回传
    const main = (val: any) => {
      if (index.value == -1) {
      form.value.takecareDetailList.push(val);
      } else {
        form.value.takecareDetailList[index.value] = val;
      }
    };
    const delect = (val: any) => {
      if (index.value == -1) {
      form.value.testDetailList.push(val);
      } else {
        form.value.testDetailList[index.value] = val;
      }
    };
    const Repair= (val:any)=>{
      if (index.value == -1) {
      form.value.repaireDetailList.push(val);
      } else {
        form.value.repaireDetailList[index.value] = val;
      }
    }
    const Stand=(val:any)=>{
      if (index.value == -1) {
      form.value.checkStandardeDetailList.push(val);
      } else {
        form.value.checkStandardeDetailList[index.value] = val;
      }
    }

      //图片提交
@@ -562,8 +592,8 @@
      delect,
      Repair,
      Stand,
      index,
         activeName,
         tableData,
         categoryShow,
         opencategory,
         planShow,
@@ -593,6 +623,14 @@
         toggleFullscreen,
         FullScreen,
         resetForm,
      deleteAId,
      deleteBId,
      deleteCId,
      deleteDId,
      deleteA,
      deleteB,
      deleteC,
      deleteD,
      };
   },
});