Merge remote-tracking branch 'origin/master'

lin

2024-04-17 2f03f1d400487fe9d2f79bcc2ddc602d0ecf7281

Merge remote-tracking branch 'origin/master'

 src/views/place/components/baseAllInfo.vue

@@ -336,8 +336,26 @@
                required: false,
                message: "请选择三级消防单位",
                trigger: "blur",
              }, ],
              }],
            },

            {
              span: 12,
              label: "无炸类型",
              prop: "noExplosionCategory",
              type: "select",
              labelWidth: 120,
              display: true,
              row: true,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=noExplosionCategory",
              dataType: "number",
              hide: true,
              props: {
                label: "dictValue",
                value: "dictKey",
              },
            },

            {
              label: "场所照片",
              prop: "imageUrls",

 src/views/publicSecurity/noExplosionManage.vue

@@ -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>

 src/views/userHouse/houseHoldList.vue

@@ -58,7 +58,21 @@
            </div>
          </el-col>
        </el-row>
        <div class="grid-container2" v-if="item.children">

        <el-collapse accordion @change="handleChange" v-if="item.children[0].children.length">
          <el-collapse-item :title="item2.name" :name="index2" v-for="(item2, index2) in item.children" :key="index2">
            <div class="grid-container2">
              <div class="grid-item" :style="{ backgroundColor: getColor(i.color) }" v-for="(i, k) in item2.children"
                @click="changLabel(i)" :key="k">
                {{ i.name }}
              </div>
            </div>
          </el-collapse-item>
        </el-collapse>



        <div class="grid-container2" v-else>
          <div class="grid-item" :style="{ backgroundColor: getColor(item2.color) }"
            v-for="(item2, index2) in item.children" @click="changLabel(item2)" :key="index2">
            {{ item2.name }}
@@ -919,10 +933,21 @@
          // 查询详情
          getDetatils(item.id).then(res => {
            this.householdLabelList = res.data.data.householdLabelList
          console.log("===>", this.householdLabelList);
            // 将细类放到一起
            data.forEach(e => {
              e.children.forEach(f => {
                if (this.householdLabelList.length > 0) {
                if (f.children.length) {
                  f.children.forEach(k => {
                    this.householdLabelList.forEach(h => {
                      if (Number(k.id) == h.labelId) {
                        k['color'] = h.color
                        k['remark'] = h.remark
                      }
                    })
                  })
                } else {
                  this.householdLabelList.forEach(h => {
                    if (Number(f.id) == h.labelId) {
                      f['color'] = h.color
@@ -930,6 +955,8 @@
                    }
                  })
                }

              }
              })
            })
            this.labelData = data