Merge remote-tracking branch 'origin/master'

懒羊羊

2024-03-19 27c1f989d25d1e7c5fccc9cb62f202295fbf9441

 jcdm-ui/src/views/main/em/inspectionPlan/index.vue

@@ -94,23 +94,32 @@
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>

        <el-table border v-loading="loading" :data="inspectionPlanList" @selection-change="handleSelectionChange" @inSelected="inMachineryAdd">
        <el-table border v-loading="loading" :data="inspectionPlanList" @selection-change="handleSelectionChange" >
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="计划名称" align="center" prop="planName">
          </el-table-column>
          <el-table-column label="计划编号" align="center" prop="planCode">
          </el-table-column>
          <el-table-column label="计划类型" align="center" prop="planType">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.plan_type" :value="scope.row.planType"/>
            </template>
          </el-table-column>
          <el-table-column label="频率" align="center" prop="frequency">
          </el-table-column>
          <el-table-column label="维度" align="center" prop="dimension">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.dimension" :value="scope.row.dimension"/>
            </template>
          </el-table-column>
          <el-table-column label="开始时间" align="center" prop="startTime">
          </el-table-column>
          <el-table-column label="结束时间" align="center" prop="endTime">
          </el-table-column>
          <el-table-column label="状态" align="center" prop="state">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.plan_status" :value="scope.row.state"/>
            </template>
          </el-table-column>
          <el-table-column label="上次生成时间" align="center" prop="lastGenerationTime">
          </el-table-column>
@@ -151,7 +160,6 @@
        <el-form-item label="状态" prop="state">
          <el-radio-group style="width: 450px" v-model="form.status">
            <el-radio

              v-for="dict in dict.type.plan_status"
              :key="dict.value"
              :label="dict.value"
@@ -206,7 +214,7 @@
      </el-form>
      <el-tabs type="border-card" >
        <el-tab-pane label="设备清单" >
          <Checkmachinery ref="machinerylist"  ></Checkmachinery>
          <Checkmachinery ref="machinerylist"  @inSelected="onMachineryAdd"></Checkmachinery>
        </el-tab-pane>
        <el-tab-pane label="点检项目">
          <Checksubject ref="subjectlist"></Checksubject>
@@ -215,13 +223,14 @@
      <el-divider></el-divider>
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      <el-button type="primary" @click="cs">测 试</el-button>
      <el-button @click="checkMachineryAdd">测试</el-button>
    </el-dialog>
  </div>
</template>

<script>
import { listInspectionPlan, getInspectionPlan, delInspectionPlan, addInspectionPlan, updateInspectionPlan } from "@/api/main/em/inspectionPlan/inspectionPlan";
import { listInspectionPlanArchives, delInspectionPlanArchives, addInspectionPlanArchives} from "@/api/main/em/inspectionPlanArchives/inspectionPlanArchives";
import Checkmachinery from "./machinery.vue"
import Checksubject from "./subject.vue"

@@ -247,6 +256,7 @@
      total: 0,
      // 点检保养计划表格数据
      inspectionPlanList: [],
      machineryList: [],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
@@ -375,9 +385,11 @@
      };
      this.resetForm("form");
    },
    /** 测试按钮 */
    cs(){
      this.$emit('inSelected',this.planCode);

    onMachineryAdd(checkmachineryList){
      if(checkmachineryList !=null && checkmachineryList.length >0){
        this.machineryList = checkmachineryList
      }
    },
    /** 搜索按钮操作 */
    handleQuery() {
@@ -411,6 +423,14 @@
        this.titleName = "修改点检保养计划";
      });
    },
    /** 设备清单新增 */
    checkMachineryAdd(){
      for (let i = 0; i < this.machineryList.length; i++) {
        this.machineryList[i].planCode = this.form.planCode
        addInspectionPlanArchives(this.machineryList[i]).then(response =>{
        });
      }
    },
    /** 提交按钮 */
    submitForm() {
      this.$refs["form"].validate(valid => {