Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

guanqb

2024-02-18 8da26ccfd659a945819ad86d38bcaf0a9920f2d4

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

 src/api/patrol/placeChek.js

@@ -47,3 +47,10 @@
    }
  })
}

export const getPatrolGroupTree = () => {
  return request({
    url: '/api/patrol/patrolGroup/getPatrolGroupTree',
    method: 'get',
  })
}

 src/views/patrolList/patrolRecord.vue

@@ -15,18 +15,36 @@
    <el-drawer title="巡查详情" :visible.sync="isDetail" :append-to-body="true" size="60%" direction="rtl">

      <el-card class="trackClass" style="overflow-y: auto">
        <el-form :model="form" label-position="right" size="mini" class="taskinfoForm" label-width="70px">

        <el-collapse v-model="activeNames" @change="handleChange">
          <div v-for="(item, index) in 10" :key="index">
            <el-collapse-item title="一致性 Consistency" name="1">
              <div>{{index}}

                <el-collapse v-model="activeNames" @change="handleChange">
                  <div v-for="(item, index) in 3" :key="index">
                    <el-collapse-item title="er致性 Consistency" name="1">
                      <div>在界面中一致：所有的元素和结构需保持一致，比如：设计样式、图标和文本、元素的位置等。{{index}}</div>
                    </el-collapse-item>
                  </div>
                </el-collapse>
              </div>
            </el-collapse-item>
          </div>
        </el-collapse>

        <!--  <el-form :model="form" label-position="right" size="mini" class="taskinfoForm" label-width="70px">
          <el-row>
            <el-col :span="24">
              <el-form-item label="巡检状态">
                <el-input :disabled="true" v-model="form.$status" autocomplete="off"></el-input>
              <el-form-item label="巡查内容">
                <el-input :disabled="true" v-model="form.content" autocomplete="off"></el-input>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="24">
              <el-form-item label="巡查内容">
                <el-input :disabled="true" v-model="form.content" autocomplete="off"></el-input>
              <el-form-item label="巡检状态">
                <el-input :disabled="true" v-model="form.$status" autocomplete="off"></el-input>
              </el-form-item>
            </el-col>
          </el-row>
@@ -39,7 +57,8 @@

            </el-col>
          </el-row>
        </el-form>
        </el-form> -->

      </el-card>

      <!-- <DcMap v-if="isDetail" :is-detail="isDetail" :range="form.taskRoute" :patrolRoute="form.patrolRoute">
@@ -54,22 +73,18 @@
  import {
    getList,
    remove,
    update,
    add,
    getNotice,
    upcomment
    update,
    getDetail,
    getPatrolGroupTree
  } from "@/api/patrol/placeChek"

  import {
    addPd,
  } from "@/api/discuss/publicDiscuss"

  import website from '@/config/website'


  import {
    getDistrictTree
  } from "@/api/district/index"
  // import {
  //   getDistrictTree
  // } from "@/api/district/index"

  import {
    mapGetters
@@ -194,7 +209,7 @@
        },
        data: [],

        districtTree: [],
        patrolTree: [],
      }
    },
    watch: {
@@ -325,13 +340,11 @@
          this.loading = false
          this.selectionClear()
        })
        getDistrictTree({
          filterFlag: 1
        }).then((res) => {
        getPatrolGroupTree({}).then((res) => {
          const data = res.data.data
          this.districtTree = data
          const column = this.findObject(this.option.column, "articleList")
          column.dicData = res.data.data
          this.patrolTree = data
          // const column = this.findObject(this.option.column, "articleList")
          // column.dicData = res.data.data
          this.loading = false
        })
      },

 src/views/place/components/auditBase.vue

@@ -65,6 +65,8 @@
                    type: 'warning',
                    message: "请输入审批意见!",
                })

                return
            }

            setCheckPlaceExt({

 src/views/userHouse/lable/list.vue

@@ -154,6 +154,20 @@
      rowUpdate(row, index, done) {
        const column = this.findObject(this.option.column, "parentId")
        column.value = row.id
        update(row).then(
          () => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
            done()
          },
          (error) => {
            window.console.log(error)
            loading()
          }
        )
        done(row)
      },