Merge remote-tracking branch 'origin/master'

lin

2024-04-17 2f03f1d400487fe9d2f79bcc2ddc602d0ecf7281

 src/views/publicSecurity/noExplosionManage.vue

@@ -42,7 +42,7 @@
      custom-class="flow-design-dialog" :before-close="handleClose">
      <audit-base @handleSubmit="submitAudit"></audit-base>
    </el-dialog>
    <el-drawer title="消防自查详情" :visible.sync="isDetail" :append-to-body="true" size="40%" direction="rtl">
    <el-drawer title="无诈申请" :visible.sync="isDetail" :append-to-body="true" size="40%" direction="rtl">
      <div class="title">
        <div class="icon">{{ refreshNum }}</div>
        基础信息
@@ -57,17 +57,17 @@
          <div class="info-value">{{ rowDetail.noExplosionCategoryName }}</div>
        </div> -->
        <div class="info-item">
          <div class="info-name">检查人</div>
          <div class="info-name">上报人</div>
          <div class="info-value">{{ rowDetail.name }}</div>
        </div>
        <div class="info-item">
          <div class="info-name">检查时间</div>
          <div class="info-name">上报时间</div>
          <div class="info-value">{{ rowDetail.createTime }}</div>
        </div>
      </div>
      <div class="title">
        <div class="icon"></div>
        检查记录
        上报记录
      </div>

      <div class="question-list" v-for="(tItem, tIndex) in rowDetail.qTypeList" :key='tIndex' v-loading="drawerLoading">
@@ -91,7 +91,7 @@
            </div>
            <div class="yh-pic-list">
              <div class="pic-item" v-for="pic in item.imageUrlsList">
                <el-image style="width: 100px; height: 100px" :src="pic" :fit="fit"></el-image>
                <el-image style="width: 100px; height: 100px" :src="pic" :fit="fit"    :preview-src-list="item.imageUrlsList"></el-image>
              </div>
            </div>
          </div>
@@ -226,7 +226,7 @@
              overHidden: true,
              align: 'center'
            }, {
              label: "场所类别",
              label: "无诈类别",
              prop: "noExplosionCategory",
              align: 'center',
              dicUrl: "/api/blade-system/dict-biz/tree?code=noExplosionCategory",
@@ -260,8 +260,8 @@
              align: 'center'
            },
            {
              label: "所属网格",
              prop: "gridName",
              label: "派出所",
              prop: "pcsName",
              span: 24,
              row: true,
              searchSpan: 4,
@@ -287,15 +287,15 @@
              searchSpan: 4,
              align: 'center'
            },
            {
              label: "无诈上报数量",
              prop: "number",
              span: 24,
              row: true,
              slot: true,
              searchSpan: 4,
              align: 'center'
            },
            // {
            //   label: "无诈上报数量",
            //   prop: "number",
            //   span: 24,
            //   row: true,
            //   slot: true,
            //   searchSpan: 4,
            //   align: 'center'
            // },
            {
              width: 110,
              label: "审核状态",