2

lkk

2025-04-11 9314d8cdd5e7a29f1061f59cccd7cce17b7fef3b

2

 src/components/public/index.vue

@@ -1,11 +1,6 @@
<template>
  <div>
    <el-dialog
      :title="title"
      :visible.sync="open"
      width="1080px"
      append-to-body
    >
    <el-dialog :title="title" :visible.sync="open" width="1080px" append-to-body>
      <h3 v-if="fList.proResult">检测项目 :{{ fList.project.proName }}</h3>
      <h3 v-if="fList.proResult">
        检测结果 :{{ fList.proResult }}{{ fList.project.proMetering }}
@@ -54,49 +49,25 @@
      <h2 style="text-align: center;margin-top: -30px;">{{ queryParams.proName  || '暂无项目名称'  }}</h2>
      <div style="display: flex; width: 100%">
        <div style="width: 50%; margin-right: 40px">
          <el-table
            :data="dataList"
            ref="multipleTable"
            v-loading="loading"
            row-key="aid"
            @selection-change="handleSelectionChange"
            border
            height="420px"
          >
          <el-table :data="dataList" ref="multipleTable" v-loading="loading" @selection-change="handleSelectionChange"
            border height="420px">
            <el-table-column type="selection" width="40" align="center" />
            <el-table-column
              label="序号"
              type="index"
              align="center"
              width="50px"
            />
            <el-table-column label="序号" type="index" align="center" width="50px" />
            <!-- <el-table-column label="规则" align="center" prop="ruleStr" /> -->
            <el-table-column label="检查所见" align="center" prop="yxbx" />
            <el-table-column label="检查结论" align="center" prop="ruleStr" />
          </el-table>
          <div class="pag">
            <div class="pag1" style="margin-left: 630px">
              <pagination
                small
                v-show="total > 0"
                :total="total"
                :page.sync="queryParams.pageNum"
                :limit.sync="queryParams.pageSize"
                @pagination="getList"
              />
              <pagination small v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
                :limit.sync="queryParams.pageSize" @pagination="getList" />
            </div>
          </div>
        </div>

        <div style="width: 100%; height: 600px">
          <!-- <h3 style="margin-top: -30px;">已选项目</h3> -->
          <el-form
            :model="form"
            ref="queryForm"
            size="small"
            label-width="68px"
            :inline="true"
          >
          <el-form :model="form" ref="queryForm" size="small" label-width="68px" :inline="true">
            <!--  :inline="true" -->
            <!-- <el-form-item>
              <el-input
@@ -106,29 +77,17 @@
              ></el-input>
            </el-form-item> -->
            <el-form-item label="检查所见" prop="jcsj">
              <el-input
                v-model="form.jcsj"
                clearable
                type="textarea"
                :autosize="{ minRows: 8 }"
                style="width: 380px"
              />
              <el-input v-model="form.jcsj" clearable type="textarea" :autosize="{ minRows: 8 }" style="width: 380px" />
            </el-form-item>
            <el-form-item label="检查结论" prop="conclusion">
              <el-input
                v-model="form.desc"
                clearable
                type="textarea"
                :autosize="{ minRows: 8 }"
                style="width: 380px"
              />
              <el-input v-model="form.desc" clearable type="textarea" :autosize="{ minRows: 8 }" style="width: 380px" />
            </el-form-item>
          </el-form>
        </div>
      </div>

      <span slot="footer" class="dialog-footer" style="margin-top: -120px">
        <el-button @click="open = false">取 消</el-button>
        <el-button @click="callcolos">取 消</el-button>
        <el-button type="primary" @click="handleOk">确 定</el-button>
      </span>
    </el-dialog>
@@ -179,7 +138,7 @@
        bingzhong: "",
        bzPinyin: "",
        proId:"",
      //   proName:"",
        proName: "",
        pageNum: 1,
        pageSize: 10,
      },
@@ -204,7 +163,7 @@
        if (newVal && newVal.length > 0) {
          const firstProject = newVal[0]; // 你也可以遍历所有项目，看你业务需求
          this.queryParams.proId = firstProject.proId; // 假设项目中叫 id
          // this.queryParams.proName = firstProject.proName;
          this.queryParams.proName = firstProject.proName; // 假设叫 proName
          this.proName = firstProject.proName
        }
      },
@@ -217,10 +176,12 @@
    async getList() {
      try {
        this.loading = true; // 添加加载状态

        const res = await getlist(this.queryParams);
        this.dataList = res.rows;
        this.total = res.total;
      
          this.updateData(this.proResult, this.conclusion);
        

        // 如果需要选中操作，将其封装为独立方法
        await this.handleAutoSelection();
@@ -237,9 +198,6 @@
      if (!this.fList?.rulesList?.length) return;

      await this.$nextTick();
      // 先清除所有选择
      this.$refs.multipleTable?.clearSelection();
      // 再进行选择
      this.dataList.forEach((item) => {
        const shouldSelect = this.fList.rulesList.some(
          (rule) => rule.aid === item.aid
@@ -260,43 +218,56 @@
    },

    updateData(proResult, conclusion) {
      if (this.checkStatus === "1") {
      console.log(proResult, conclusion, 5658)
    
        this.form.jcsj = proResult; // 更新检查所见
        this.form.desc = conclusion; // 更新检查结论
        // console.log(proResult, conclusion);
        if (this.list.length != 0) {
          let desc = ""
            desc += this.list
              .map((item) => item.bingzhong || item.ruleStr)
              .filter(Boolean)
              .join(",");
            let jcsj = ""
            jcsj += this.list
              .map((item) => item.yxbx)
              .filter(Boolean)
              .join(",");
            this.form.jcsj =  this.form.jcsj+jcsj; // 更新检查所见
            this.form.desc= this.form.desc+desc;
         
      }
      
    },

    handleSelectionChange(selection) {
      console.log('Selection changed:', selection);
      this.list = [...selection]; // 使用展开运算符创建新数组
      this.list = selection;
      this.updateFormContent(selection);
    },

    updateFormContent(selection) {
      // 如果处于检查状态，使用传入的值
      if (this.checkStatus === "1") {
      // if (!selection.length) return;
        this.updateData(this.proResult, this.conclusion);
        return;
      }
      // 如果处于检查状态，使用传入的值
      // if (this.checkStatus === "1") {
      //   this.updateData(this.proResult, this.conclusion);
      //   return;
      // }

      // 重置表单内容
      this.form.desc = "";
      this.form.jcsj = "";
      // this.form.desc = "";
      // this.form.jcsj = "";
      // console.log(22222);
      // // 使用map和join替代forEach和字符串拼接
      // this.form.desc = selection
      //   .map((item) => item.bingzhong || item.ruleStr)
      //   .filter(Boolean)
      //   .join(",");

      // 只有在有选中项时才进行拼接
      if (selection.length > 0) {
        // 使用map和join替代forEach和字符串拼接
        this.form.desc = selection
          .map((item) => item.bingzhong || item.ruleStr)
          .filter(Boolean)
          .join(",");

        this.form.jcsj = selection
          .map((item) => item.yxbx)
          .filter(Boolean)
          .join(",");
      }
      // this.form.jcsj = selection
      //   .map((item) => item.yxbx)
      //   .filter(Boolean)
      //   .join(",");
    },

    handleOk() {
@@ -323,6 +294,9 @@
        this.$refs.multipleTable.clearSelection();
      }
    },
    callcolos() {
      this.open = false;
    }
  },
  computed: {
    isCheckMode() {
@@ -340,9 +314,9 @@
.el-dialog__body {
  padding: 10px 20px;
}

::v-deep .el-dialog__footer {
  padding: 0 !important;
  padding-bottom: 40px !important;
}
</style>