Merge branch 'master' into dev-threejs

ZhangXianQiang

2024-04-16 549240a042edad52f9642721e7b1f51b90ddaf34

 src/views/system/report/index.vue

@@ -93,7 +93,11 @@
      <el-table-column label="点位" align="center" prop="pointName" />
      <el-table-column label="报备类型" align="center" prop="reportType" />
      <el-table-column label="报备内容" align="center" prop="reportContent" show-overflow-tooltip="true" />
      <el-table-column label="上报材料" align="center" prop="reportMaterials" />
      <el-table-column label="上报材料" align="center" prop="reportMaterials" show-overflow-tooltip="true">
        <template slot-scope="scope">
          <div v-for="(item, index) in scope.row.reportMaterials.split(',')" :key="index">{{ item.substring(item.lastIndexOf("/") + 1) }}</div>
        </template>
      </el-table-column>
      <el-table-column label="故障类型" align="center" prop="errorType" />
      <el-table-column label="审核时间" align="center" prop="auditingTime" width="180">
        <template slot-scope="scope">
@@ -169,15 +173,16 @@
            <el-option label="设备遗失" value="设备遗失"/>
          </el-select>
        </el-form-item>
        <el-form-item label="有效时间">
        <el-form-item label="报备时间" prop="expirTime">
          <el-date-picker
            v-model="expirTime"
            v-model="form.expirTime"
            style="width: 240px"
            value-format="yyyy-MM-dd"
            type="daterange"
            range-separator="-"
            start-placeholder="生效日期"
            end-placeholder="失效日期"
            start-placeholder="开始日期"
            end-placeholder="结束日期"
            @change="handleExpirTimeChange"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="报备内容" prop="reportContent">
@@ -222,7 +227,7 @@
          <el-input type="textarea" v-html="auditingForm.reportContent" disabled />
        </el-form-item>
        <el-form-item label="上报材料">
          <el-link :href="auditingForm.reportMaterials" :underline="false">{{ auditingForm.reportMaterials }}</el-link>
          <el-link v-for="item in auditingForm.reportMaterials != null ? auditingForm.reportMaterials.split(',') : auditingForm.reportMaterials" :underline="false" :key="item" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
        </el-form-item>
        <el-form-item label="审核结果">
          <el-radio-group v-model="auditingForm.status">
@@ -328,7 +333,7 @@
          { required: true, message: "请选择故障类型", trigger: "blur" }
        ],
        expirTime: [
          { required: true, message: "请选择有效时间", trigger: "blur" }
          { required: true, message: "请选择报备时间", trigger: "blur" }
        ],
      }
    };
@@ -454,13 +459,14 @@
        this.auditingForm = {}
      });
    },
    handleExpirTimeChange() {
      if (null != this.form.expirTime && '' != this.form.expirTime) {
        this.form["beginCreateTime"] = this.form.expirTime[0];
        this.form["endCreateTime"] = this.form.expirTime[1];
      }
    },
    /** 提交按钮 */
    submitForm() {

      if (null != this.expirTime && '' != this.expirTime) {
        this.form["beginCreateTime"] = this.expirTime[0];
        this.form["endCreateTime"] = this.expirTime[1];
      }

      // todo 判断是事前报备

@@ -497,6 +503,10 @@
      this.download('report/export', {
        ...this.queryParams
      }, `report_${new Date().getTime()}.xlsx`)
    },
    /** 下载按钮操作 */
    handleDownload (data) {
      this.$download.resource(data);
    }
  }
};