guanqb
2023-03-30 e8ac5b460a4933671134ce343acdc7a6727e84c6
弹窗加载
5 files modified
155 ■■■■■ changed files
src/components/mapSearchBox/index.vue 4 ●●●● patch | view | raw | blame | history
src/views/home/components/schedulingList.vue 11 ●●●●● patch | view | raw | blame | history
src/views/home/index.vue 63 ●●●●● patch | view | raw | blame | history
src/views/house/index.vue 67 ●●●●● patch | view | raw | blame | history
src/views/police/index.vue 10 ●●●● patch | view | raw | blame | history
src/components/mapSearchBox/index.vue
@@ -94,6 +94,10 @@
        },
        clearSearchValue () {
            this.$EventBus.$emit('mapRemoveLayer', {
                layerName: 'searchLayer',
                type: 'VectorLayer'
            })
            this.searchExtensivelyValue = ''
            this.searchExtensivelyChange()
        },
src/views/home/components/schedulingList.vue
@@ -16,7 +16,9 @@
            <el-table :data="schedulingTableData" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"
                v-loading="chedulingLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(17, 38, 163, 1)">
                <el-table-column label="序号" type="index" align="center">
                    <template slot-scope="scope">
@@ -46,6 +48,7 @@
    data () {
        return {
            person: '',
            chedulingLoading: false,
            contact: '',
            // 值班搜索条件
            schedulingSearchVal: '',
@@ -67,6 +70,7 @@
        //初始化
        init (data) {
            this.schedulingVisible = true
            this.chedulingLoading = true
            this.schedulingTitle = data.name + "值班信息"
            this.dept = data.dept
            this.getSchedulingtPaging()
@@ -88,6 +92,7 @@
         * @return {*}
         */
        searchScheduling () {
            this.chedulingLoading = true
            this.page.currentPage = 1
            this.getSchedulingtPaging()
        },
@@ -97,6 +102,7 @@
         * @return {*}
         */
        clearSearchScheduling () {
            this.chedulingLoading = true
            this.page.currentPage = 1
            this.person = ''
            this.contact = ''
@@ -126,6 +132,9 @@
                        this.schedulingTableData = res.data.data.records
                        this.page.total = res.data.data.total
                    }
                    setTimeout(() => {
                        this.chedulingLoading = false
                    }, 500)
                })
        },
    }
src/views/home/index.vue
@@ -126,17 +126,17 @@
    <el-dialog :title="keyPersonTitle" :modal="true" :visible.sync="keyPersonVisible" :before-close="personInfoClose"
        :close-on-click-modal="true" class="keyPerson-details-box">
        <!-- <div class="header" v-show="!isMaoJiaLin">
                                                <div>
                                                    人员名称:
                                                    <input type="text" v-model="peoplePoliceName" placeholder="请输入人员名称" />
                                                </div>
                                                <div>
                                                    联系电话:
                                                    <input type="text" v-model="peopleCallPhone" placeholder="请输入联系电话" />
                                                </div>
                                                <el-button type="primary" icon="el-icon-search" @click="searchPeopleDetail">搜索</el-button>
                                                <el-button type="primary" icon="el-icon-delete" @click="clearPeopleDetailSearchValue">清空</el-button>
                                            </div> -->
                                                                                                        <div>
                                                                                                            人员名称:
                                                                                                            <input type="text" v-model="peoplePoliceName" placeholder="请输入人员名称" />
                                                                                                        </div>
                                                                                                        <div>
                                                                                                            联系电话:
                                                                                                            <input type="text" v-model="peopleCallPhone" placeholder="请输入联系电话" />
                                                                                                        </div>
                                                                                                        <el-button type="primary" icon="el-icon-search" @click="searchPeopleDetail">搜索</el-button>
                                                                                                        <el-button type="primary" icon="el-icon-delete" @click="clearPeopleDetailSearchValue">清空</el-button>
                                                                                                    </div> -->
            <el-table :data="keyPersonDetailArr" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
@@ -156,7 +156,7 @@
            <!-- <el-table-column :show-overflow-tooltip="true" prop="areaName" label="所属责任区"></el-table-column> -->
            <el-table-column label="操作" align="center" :min-width="typeValue == 0 || typeValue == 2 ? '30%' : '18%'">
                <template slot-scope="scope">
                    <el-button @click="rowClick(scope.row)" type="text" size="small" title="定位">
                    <el-button @click="rowClick(scope.row)" type="etxt" size="small" title="定位">
                            <i class="el-icon-location"></i>
                        </el-button>
                    </template>
@@ -164,10 +164,10 @@
            </el-table>
            <!-- <div class="pages all-pagination-sty" ref="tablePagination" v-show="!isMaoJiaLin">
                               <el-pagination background layout="prev, pager, next, total" :page-size="peoplePage.pageSize"
                                   :total="peoplePage.total" :current-page="peoplePage.currentPage"
                                   @current-change="handlePersonPageChange"></el-pagination>
                         </div> -->
                                                                                       <el-pagination background layout="prev, pager, next, total" :page-size="peoplePage.pageSize"
                                                                                           :total="peoplePage.total" :current-page="peoplePage.currentPage"
                                                                                           @current-change="handlePersonPageChange"></el-pagination>
                                                                                 </div> -->
        </el-dialog>
        <el-dialog :title="equimentTitle" :modal="true" :visible.sync="equimentVisible" :before-close="equimentBeforeClose"
@@ -241,7 +241,9 @@
            <el-table :data="landDetailArr" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"
                v-loading="landLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(17, 38, 163, 1)">
                <el-table-column label="序号" type="index" align="center">
                    <template slot-scope="scope">
                        <span>{{ (landPage.currentPage - 1) * landPage.pageSize + scope.$index + 1 }}</span>
@@ -527,6 +529,7 @@
        return {
            keyPeopleLoading: false,
            equimentLoading: false,
            landLoading: false,
            peopleKeypeopleLoading: false,
            // 是否显示辖区
            areaPolygonLayerShow: true,
@@ -1715,6 +1718,7 @@
            this.equimentCurrentSelect[type] = typeVale
            this.equimentTableData = []
            await this.getEquipmentPaging(this.equimentCurrentSelect)
            this.equimentVisible = true
@@ -1741,6 +1745,7 @@
         * @return {*}
         */
        searchEquiment () {
            this.equimentLoading = true
            this.currentPage = 1
            this.getEquipmentPaging(this.equimentCurrentSelect)
        },
@@ -1750,6 +1755,7 @@
         * @return {*}
         */
        clearSearchEquiment () {
            this.equimentLoading = true
            this.currentPage = 1
            this.equimentSearchVal = ''
            this.getEquipmentPaging(this.equimentCurrentSelect)
@@ -1766,20 +1772,16 @@
            }).then(res => {
                this.equimentTableData = []
                this.equimentPagingTotal = 0
                if (res.data.data.list.length > 0) {
                    this.equimentTableData = res.data.data.list
                    this.equimentPagingTotal = res.data.data.total
                    this.equimentLoading = false
                } else {
                    this.equimentTableData = []
                    this.equimentPagingTotal = 0
                    this.equimentLoading = false
                }
                setTimeout(() => {
                    this.equimentLoading = false
                }, 500)
            })
        },
@@ -1961,8 +1963,10 @@
                    this.peopleInfoList = []
                    this.peoplePage.total = 0
                }
                this.peopleKeypeopleLoading = false
                this.keyPeopleLoading = false
                setTimeout(() => {
                    this.peopleKeypeopleLoading = false
                    this.keyPeopleLoading = false
                }, 500)
            })
        },
@@ -2008,6 +2012,7 @@
         */
        showlanddetail (name, type, id) {
            this.landVisible = true
            this.landLoading = true
            this.landTitle = name
            this.landType = type
            this.landDetailId = id
@@ -2016,6 +2021,7 @@
        },
        clearLandDetailSearchValue () {
            this.landLoading = true
            this.policeName = ''
            this.callPhone = ''
            this.landSearchAoiName = ''
@@ -2028,6 +2034,7 @@
         * @return {*}
         */
        searchLandDetail () {
            this.landLoading = true
            this.landPage.currentPage = 1
            this.getLandDetail(this.landType, this.landDetailId, this.landPage.currentPage, this.policeName, this.callPhone, this.landSearchAoiName)
        },
@@ -2063,6 +2070,9 @@
                    this.landDetailArr = []
                    this.landPage.total = 0
                }
                setTimeout(()=>{
                    this.landLoading = false
                },500)
            })
        },
@@ -2086,6 +2096,7 @@
         */
        clearPeopleDetailSearchValue () {
            this.peoplePoliceName = ''
            this.peopleKeypeopleLoading = true
            this.peopleCallPhone = ''
            this.peoplePage.currentPage = 1
src/views/house/index.vue
@@ -142,9 +142,9 @@
                                <div class="two">
                                    <div>
                                        <div>98</div>
                                                                                                  <div>户籍人口</div>
                                                                                              </div>
                                                                                              <div>
                                                                                                          <div>户籍人口</div>
                                                                                                      </div>
                                                                                                      <div>
                                        <div style="color:#0E88FF">20</div>
                                        <div>流动人口</div>
                                    </div>
@@ -165,17 +165,17 @@
                                </div>
                                <div>
                                    <div>120</div>
                                                                                        <div>出租</div>
                                                                                          </div>
                                                                                              <div>160</div>
                                                                                              <div>自住</div>
                                                                                          </div>
                                                                                              <div>8</div>
                                                                                          <div>
                                                                                              <div>空置</div>
                                                                                          </div>
                                                                                      </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </div>-->
                                                                                                <div>出租</div>
                                                                                                  </div>
                                                                                                      <div>160</div>
                                                                                                      <div>自住</div>
                                                                                                  </div>
                                                                                                      <div>8</div>
                                                                                                  <div>
                                                                                                      <div>空置</div>
                                                                                                  </div>
                                                                                              </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                </div>-->
                        <div class="house-element-info" v-if="isShowHouseBox">
                        <!-- 选择单元 -->
                        <div class="condo" v-show="isShowUnitChoose">
@@ -220,17 +220,17 @@
                                    <div>
                                        <span class="zizhu"></span>
                                        自住
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    <div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <span class="kongzhi"></span>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        空置
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    <div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <span class="shangye"></span>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        商业
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </div>-->
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <span class="kongzhi"></span>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                空置
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <span class="shangye"></span>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                商业
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    </div>-->
                            <el-main v-loading="pictLoading" element-loading-background="rgba(17, 38, 163, .1)"
                                element-loading-text="数据正在加载中" element-loading-spinner="el-icon-loading"
                                v-show="isShowHouseBox">
@@ -267,8 +267,8 @@
                                                <!-- :class="[{ 'chuzu': value.houseType == '出租' }, { 'zizhu': value.houseType == '自住' }, { 'kongzhi': value.houseType == '空置' }, { 'shangye': value.houseType == '商业' }]" -->
                                                {{ value.properties.fojcu }}
                                                <!-- <div class="flow"></div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <div class="focus"></div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <div class="warning"></div>-->
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    <div class="focus"></div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <div class="warning"></div>-->
                                            </div>
                                        </div>
                                    </div>
@@ -410,7 +410,9 @@
            :before-close="residentDetailsClose" :close-on-click-modal="true" class="resident-details-box" width="24%">
            <el-table :data="houseDate"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }">
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }" v-loading="residentLoading"
                element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(17, 38, 163, 1)">
                <el-table-column prop="realName" label="姓名"></el-table-column>
                <el-table-column prop="phone" label="电话"></el-table-column>
                <el-table-column prop="cardNo" label="身份证号"></el-table-column>
@@ -481,6 +483,7 @@
            // 下拉搜索--树状数据相关
            searchTreeShowFlag: false,
            keyPeopleLoading: false,
            residentLoading: false,
            searchTreeName: '',
            searchTreeData: [],
            props: {
@@ -908,6 +911,7 @@
            this.getVillagePersonInfo(params.properties.snxmi)
            this.residentDetailsTitle = `${curHousingName}${this.unitOptions.filter(item => item.value == this.unitValue)[0].label}${params.properties.fojcu}住户信息`
            this.residentDetailsShow = true
            this.residentLoading = true
            console.log('residentDetailsClick-params', params)
            this.$EventBus.$emit('showHouse3D', { positions: params.properties.kmj3a, minHeight: params.properties.szhfr, maxHeight: params.properties.szhfr + params.properties.hnagn })
        },
@@ -1221,12 +1225,16 @@
                } else {
                    this.houseDate = res.data.data.records
                }
                this.keyPeopleLoading = false
                setTimeout(() => {
                    this.keyPeopleLoading = false
                    this.residentLoading = false
                }, 500)
            })
        },
        // 清空人员列表搜索内容
        clearPeopleDetailSearchValue () {
            this.keyPeopleLoading = true
            this.callPhone = ''
            this.peopleName = ''
            this.peoplePage.currentPage = 1
@@ -1235,6 +1243,7 @@
        // 搜索指定人员
        searchPeopleDetail () {
            this.keyPeopleLoading = true
            this.peoplePage.currentPage = 1
            this.getVillagePersonInfo('', this.choosedBuildId, this.keyPeopleType == 1 ? '' : this.keyPeopleType, this.peoplePage.currentPage, this.peopleName, this.callPhone)
        },
src/views/police/index.vue
@@ -30,7 +30,8 @@
                    <el-table :data="equimentTableData"
                        :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', borderColor: '#324e75' }"
                        :cell-style="{ 'text-align': 'center', borderColor: '#324e75', cursor: 'pointer' }"
                        :height="currentTableHeight">
                        :height="currentTableHeight" v-loading="equimentLoading" element-loading-text="拼命加载中"
                        element-loading-spinner="el-icon-loading" element-loading-background="rgba(17, 38, 163, 1)">
                        <el-table-column prop="newName" :show-overflow-tooltip="true" label="名称"
                            :min-width="typeValue == 0 || typeValue == 2 ? '56%' : '68%'"></el-table-column>
                        <el-table-column prop="status" label="状态"
@@ -145,6 +146,7 @@
    data () {
        return {
            navType: 0,
            equimentLoading: false,
            dialogTitle: '',
            dialogVisible: false,
            searchValue: '',
@@ -231,7 +233,7 @@
                layerName: 'policeMonitoringLayers',
                type: 'VectorLayer'
            })
            this.equimentLoading =true
            this.getEquipmentPaging({ type: this.navType })
        },
        // 设备分页处理
@@ -315,6 +317,9 @@
                    this.equimentPage.total = 0
                }
                setTimeout(() => {
                    this.equimentLoading = false
                }, 500)
            })
        },
@@ -332,6 +337,7 @@
                this.navType = type
            }
            this.equimentLoading = true
            this.searchValue = ''
            this.equimentPage.currentPage = 1