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

Lou

2024-02-18 7b210f8e625f64dff5c6e128399df011ae83e08a

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/publicSecurity/bailReporting.vue

@@ -88,7 +88,7 @@
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,

                header: false,
                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
@@ -499,4 +499,5 @@
<style>
.avue-upload__icon {
    line-height: 6;
}</style>
}
</style>

 src/views/publicSecurity/components/labelReporting.vue

@@ -28,8 +28,14 @@
          submitBtn: false,
          emptyBtn: false,
          column: [{
            label: '房屋名称',
            prop: 'houseName',
                    label: '用户姓名',
                    prop: 'owner',
                    disabled: true,
                    span: 8,
                    labelWidth: 120,
                }, {
                    label: '身份证号',
                    prop: 'idCard',
            disabled: true,
            span: 8,
            labelWidth: 120,

 src/views/publicSecurity/keynotePersonnelManage.vue

@@ -1,9 +1,10 @@
<template>
  <basic-container>
    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">

      <template slot-scope="scope" slot="menu">
        <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row)">查 看
@@ -107,6 +108,7 @@
          delBtn: false,
          addBtn: false,
          // selection: true,
                header: false,
          dialogClickModal: false,
          column: [{
              span: 12,

 src/views/publicSecurity/keynotePlaceManage.vue

@@ -126,6 +126,7 @@
                editBtn: false,
                delBtn: false,
                selection: true,
                header: false,
                dialogClickModal: false,
                column: [{
                    span: 12,

 src/views/publicSecurity/ninePlaceManage/archivesManage.vue

@@ -204,6 +204,7 @@
                var data = {
                    ...this.query
                }
                data.isNine = 1
                data = Qs.stringify(data)
                exportBlob(
                    `/api/blade-place/place/exportNineType?${this.website.tokenHeader}=${getToken()}&` + data

 src/views/publicSecurity/ninePlaceManage/patrolRecord.vue

@@ -356,7 +356,7 @@

        // 九小类型转换
        switchNineType (type) {
            return this.nineTypeList.find(item => item.key === type).title
            return this.nineTypeList.find(item => item.key === type) ? this.nineTypeList.find(item => item.key === type).title : ''
        },

        // 获取问题类型

 src/views/publicSecurity/positionManage/TransactRegist.vue

@@ -127,6 +127,7 @@
                editBtn: false,
                delBtn: false,
                selection: true,
                header: false,
                dialogClickModal: false,
                column: [{
                    span: 12,

 src/views/publicSecurity/positionManage/fileManage.vue

@@ -204,6 +204,7 @@
                var data = {
                    ...this.query
                }
                data.isFront = 1
                data = Qs.stringify(data)
                exportBlob(
                    `/api/blade-place/place/exportNineType?${this.website.tokenHeader}=${getToken()}&` + data

 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)
      },