ZhangXianQiang
2024-04-26 54eb1c490d3eb203028491ff1f75cd211423eb7b
feat:新增上报内容
3个文件已修改
304 ■■■■ 已修改文件
.env.development 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.env.production 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/report/index.vue 297 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.env.development
@@ -12,3 +12,7 @@
# websocket地址
VUE_APP_WEB_SOCKET_URL = 'ws://127.0.0.1:8044/ws'
VUE_APP_FILE_URL = 'http://192.168.3.88:8085'
.env.production
@@ -9,3 +9,6 @@
# websocket地址
VUE_APP_WEB_SOCKET_URL = 'ws://127.0.0.1:8044/ws'
VUE_APP_FILE_URL = 'http://192.168.3.88:8085'
src/views/system/report/index.vue
@@ -2,41 +2,20 @@
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="运维人员" prop="peopleId">
        <el-input
          v-model="queryParams.peopleId"
          placeholder="运维人员姓名"
          clearable
          @keyup.enter.native="handleQuery"
        />
        <el-input v-model="queryParams.peopleId" placeholder="运维人员姓名" clearable @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="点位" prop="pointId">
        <el-input
          v-model="queryParams.pointId"
          placeholder="点位"
          clearable
          @keyup.enter.native="handleQuery"
        />
        <el-input v-model="queryParams.pointId" placeholder="点位" clearable @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="报备类型" prop="reportType">
        <el-select
          v-model="queryParams.reportType"
          placeholder="报备类型"
          clearable
        >
        <el-select v-model="queryParams.reportType" placeholder="报备类型" clearable>
          <el-option label="事前报备" value="事前报备" />
          <el-option label="事后报备" value="事后报备" />
        </el-select>
      </el-form-item>
      <el-form-item label="报备时间">
        <el-date-picker
          v-model="daterangeCreateTime"
          style="width: 240px"
          value-format="yyyy-MM-dd"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
        ></el-date-picker>
        <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -46,61 +25,64 @@
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['system:report:add']"
        >新增</el-button>
        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
          v-hasPermi="['system:report:add']">新增</el-button>
      </el-col>
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="success"-->
<!--          plain-->
<!--          icon="el-icon-edit"-->
<!--          size="mini"-->
<!--          :disabled="single"-->
<!--          @click="handleUpdate"-->
<!--        >修改</el-button>-->
<!--      </el-col>-->
      <!--      <el-col :span="1.5">-->
      <!--        <el-button-->
      <!--          type="success"-->
      <!--          plain-->
      <!--          icon="el-icon-edit"-->
      <!--          size="mini"-->
      <!--          :disabled="single"-->
      <!--          @click="handleUpdate"-->
      <!--        >修改</el-button>-->
      <!--      </el-col>-->
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['system:report:remove']"
        >删除</el-button>
        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
          v-hasPermi="['system:report:remove']">删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['system:report:export']"
        >导出</el-button>
        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
          v-hasPermi="['system:report:export']">导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
      <el-table-column type="expand">
        <template slot-scope="scope">
          <div class="info-container">
            <div class="info-item">
              <div class="info-label">上报内容</div>
              <div class="info-text" v-html="scope.row.reportContent"></div>
            </div>
            <div class="info-item">
              <div class="info-label">上报材料</div>
              <div class="info-list">
                <div class="list-item" v-for="file in formatFileList(scope.row.reportMaterials)" :key="file" @click="showFile(file)">
                  <div class="item-icon">
                    <i class="el-icon-document"></i>
                  </div>
                  <div class="item-text">{{ file }}</div>
                </div>
              </div>
            </div>
          </div>
        </template>
      </el-table-column>
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="运维单位" align="center" prop="unitName" />
      <el-table-column label="报备人员" align="center" prop="peopleName" />
      <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="reportContent" show-overflow-tooltip="true" />
      <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>
          <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> -->
      <el-table-column label="故障类型" align="center" prop="errorType" />
      <el-table-column label="审核时间" align="center" prop="auditingTime" width="180">
        <template slot-scope="scope">
@@ -109,90 +91,57 @@
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
<!--          <el-button-->
<!--            size="mini"-->
<!--            type="text"-->
<!--            icon="el-icon-edit"-->
<!--            @click="handleUpdate(scope.row)"-->
<!--            v-hasPermi="['system:report:edit']"-->
<!--          >修改</el-button>-->
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleAuditing(scope.row)"
            v-hasPermi="['system:report:edit']"
            v-if="scope.row.status === 0"
          >审核</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:report:remove']"
          >删除</el-button>
          <!--          <el-button-->
          <!--            size="mini"-->
          <!--            type="text"-->
          <!--            icon="el-icon-edit"-->
          <!--            @click="handleUpdate(scope.row)"-->
          <!--            v-hasPermi="['system:report:edit']"-->
          <!--          >修改</el-button>-->
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAuditing(scope.row)"
            v-hasPermi="['system:report:edit']" v-if="scope.row.status === 0">审核</el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
            v-hasPermi="['system:report:remove']">删除</el-button>
        </template>
      </el-table-column>
    </el-table>
    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
      @pagination="getList" />
    <!-- 添加或修改报备对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="点位" prop="pointId">
          <el-select
            v-model="form.pointId"
            filterable
            remote
            reserve-keyword
            placeholder="请选择点位"
            :remote-method="remoteGetPoints"
            :loading="selectLoading">
            <el-option
              v-for="item in pointList"
              :key="item.id"
              :label="item.value"
              :value="item.id">
          <el-select v-model="form.pointId" filterable remote reserve-keyword placeholder="请选择点位"
            :remote-method="remoteGetPoints" :loading="selectLoading">
            <el-option v-for="item in pointList" :key="item.id" :label="item.value" :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="报备类型" prop="reportType">
          <el-select v-model="form.reportType">
            <el-option label="事前报备" value="事前报备"/>
            <el-option label="事后报备" value="事后报备"/>
            <el-option label="事前报备" value="事前报备" />
            <el-option label="事后报备" value="事后报备" />
          </el-select>
        </el-form-item>
        <el-form-item label="故障类型" prop="errorType">
          <el-select v-model="form.errorType">
            <el-option label="市政施工" value="市政施工"/>
            <el-option label="设备故障" value="设备故障"/>
            <el-option label="设备遗失" value="设备遗失"/>
            <el-option label="市政施工" value="市政施工" />
            <el-option label="设备故障" value="设备故障" />
            <el-option label="设备遗失" value="设备遗失" />
          </el-select>
        </el-form-item>
        <el-form-item label="报备时间" prop="expirTime">
          <el-date-picker
            v-model="form.expirTime"
            style="width: 240px"
            value-format="yyyy-MM-dd"
            type="daterange"
            range-separator="-"
            start-placeholder="开始日期"
            end-placeholder="结束日期"
            @change="handleExpirTimeChange"
          ></el-date-picker>
          <el-date-picker v-model="form.expirTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
            range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
            @change="handleExpirTimeChange"></el-date-picker>
        </el-form-item>
        <el-form-item label="报备内容" prop="reportContent">
          <editor v-model="form.reportContent" :min-height="192"/>
          <editor v-model="form.reportContent" :min-height="192" />
        </el-form-item>
        <el-form-item label="上报材料" prop="reportMaterials">
          <file-upload v-model="form.reportMaterials"/>
          <file-upload v-model="form.reportMaterials" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -230,7 +179,10 @@
          <el-input type="textarea" v-html="auditingForm.reportContent" disabled />
        </el-form-item>
        <el-form-item label="上报材料">
          <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-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">
@@ -239,7 +191,7 @@
          </el-radio-group>
        </el-form-item>
        <el-form-item label="审核意见" prop="suggest">
          <el-input v-model="auditingForm.auditOpinion"/>
          <el-input v-model="auditingForm.auditOpinion" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -350,17 +302,17 @@
    },
    handleAuditing(row) {
      this.auditingOpen = true;
      this.auditingForm.id =row.id
      this.auditingForm.pointId =row.pointId
      this.auditingForm.pointName =row.pointName
      this.auditingForm.unitName =row.unitName
      this.auditingForm.peopleName =row.peopleName
      this.auditingForm.errorType =row.errorType
      this.auditingForm.reportContent =row.reportContent
      this.auditingForm.reportType =row.reportType
      this.auditingForm.endCreateTime =row.endCreateTime
      this.auditingForm.beginCreateTime =row.beginCreateTime
      this.auditingForm.reportMaterials =row.reportMaterials
      this.auditingForm.id = row.id
      this.auditingForm.pointId = row.pointId
      this.auditingForm.pointName = row.pointName
      this.auditingForm.unitName = row.unitName
      this.auditingForm.peopleName = row.peopleName
      this.auditingForm.errorType = row.errorType
      this.auditingForm.reportContent = row.reportContent
      this.auditingForm.reportType = row.reportType
      this.auditingForm.endCreateTime = row.endCreateTime
      this.auditingForm.beginCreateTime = row.beginCreateTime
      this.auditingForm.reportMaterials = row.reportMaterials
    },
    // 远程搜索点位
    remoteGetPoints(query) {
@@ -433,7 +385,7 @@
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.id)
      this.single = selection.length!==1
      this.single = selection.length !== 1
      this.multiple = !selection.length
    },
    /** 新增按钮操作 */
@@ -494,12 +446,12 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除报备编号为"' + ids + '"的数据项?').then(function() {
      this.$modal.confirm('是否确认删除报备编号为"' + ids + '"的数据项?').then(function () {
        return delReport(ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
      }).catch(() => { });
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -508,9 +460,74 @@
      }, `report_${new Date().getTime()}.xlsx`)
    },
    /** 下载按钮操作 */
    handleDownload (data) {
    handleDownload(data) {
      this.$download.resource(data);
    },
    formatFileList(data) {
      if (!data) return [];
      return data.split(',');
    },
    showFile(filePath) {
      console.log(process.env.VUE_APP_FILE_URL + filePath);
    }
  }
};
</script>
<style lang="scss" scoped>
.info-container {
  width: 100%;
  max-height: 400px;
  overflow-y: scroll;
}
.info-item {
  display: flex;
  margin-bottom: 20px;
  .info-label {
    font-size: 14px;
    font-weight: bold;
    margin-right: 20px;
  }
  .info-text {
    width: 20%;
    padding: 20px;
    border-radius: 10px;
    border: 1px solid #c0c0c0;
  }
  .info-list {
    width: 20%;
    .list-item {
      width: 100%;
      border-radius: 5px;
      border: 1px solid #c0c0c0;
      padding: 10px 10px;
      display: flex;
      align-items: center;
      margin-bottom: 10px;
      cursor: pointer;
      .item-icon {
        flex-shrink: 0;
        margin-right: 5px;
      }
      .item-text {
        flex-grow: 1;
        white-space: nowrap;
        overflow: hidden;
        text-overflow: ellipsis;
      }
      &:hover {
        border-color: #1890ff;
      }
    }
  }
}
</style>