elink-star
/
epmet-oper-gov
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复一系列bug2

shibei_prod
dai 4 years ago
parent
fb96aaa725
commit
9f9868c4a0
4 changed files with 405 additions and 384 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      src/assets/img/shuju/measure/qydw.png
  2. 4
      src/assets/scss/modules/search.scss
  3. 753
      src/views/modules/shequ/index.vue
  4. 32
      src/views/modules/visual/warning/components/screen-table/index.vue

BIN
src/assets/img/shuju/measure/qydw.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

4
src/assets/scss/modules/search.scss
View File

@ -85,7 +85,9 @@
} }
} }
.m-panel { .m-panel {
padding: 0 10px; background-color: #fff;
border-radius: 10px;
padding: 30px 40px;
.operate { .operate {
text-align: right; text-align: right;

753
src/views/modules/shequ/index.vue
View File

@ -1,269 +1,378 @@
<template> <template>
<div> <div>
<div class="m-info"> <div v-show="!showedFuncPanel">
<div class="wrap"> <div class="m-info">
<div class="logo"> <div class="wrap">
<img src="@/assets/img/shequ/logo.png" /> <div class="logo">
</div> <img src="@/assets/img/shequ/logo.png" />
</div>
<div class="search"> <div class="search">
<div class="input"> <div class="input">
<select v-model="searchData.type"> <select v-model="searchData.type">
<option value="jumin">居民</option> <option value="jumin">居民</option>
<option value="fangwu">房屋</option> <option value="fangwu">房屋</option>
<option value="xuqiu">需求</option> <option value="xuqiu">需求</option>
</select> </select>
<input <input
type="text" type="text"
:placeholder="typePlaceholder[searchData.type]" :placeholder="typePlaceholder[searchData.type]"
v-model="searchData.keyword" v-model="searchData.keyword"
@keyup.enter="handleClickSearchBtn" @keyup.enter="handleClickSearchBtn"
/> />
<div <div
class="close-btn" class="close-btn"
v-if="searchData.keyword != ''" v-if="searchData.keyword != ''"
@click="searchData.keyword = ''" @click="searchData.keyword = ''"
> >
<img src="@/assets/img/shequ/close.png" /> <img src="@/assets/img/shequ/close.png" />
</div>
</div> </div>
<div class="btn" @click="handleClickSearchBtn">搜索</div>
</div> </div>
<div class="btn" @click="handleClickSearchBtn">搜索</div>
</div>
<div <div
class="m-tb" class="m-tb"
v-if=" v-if="
searchData.type == 'jumin' && searchData.type == 'jumin' &&
searchData.keyword != '' && searchData.keyword != '' &&
searchStatus == 'ing' searchStatus == 'ing'
" "
> >
<div class="tb"> <div class="tb">
<el-table <el-table
:data="searchJumin.list" :data="searchJumin.list"
border border
style="width: 100%" style="width: 100%"
class="resi-table" class="resi-table"
:max-height="1000" :max-height="1000"
>
<el-table-column
label="序号"
type="index"
align="center"
width="50"
/>
<el-table-column
v-for="item in searchJumin.header"
:key="item.columnName"
:prop="item.columnName"
:label="item.label"
align="center"
:show-overflow-tooltip="true"
:width="
item.itemType === 'radio' ? computedWidth(item.label) : 180
"
> >
<template slot-scope="scope"> <el-table-column
<span>{{ handleFilterSpan(scope.row, item) }}</span> label="序号"
</template> type="index"
</el-table-column> align="center"
<el-table-column fixed="right" label="操作" align="center"> width="50"
<template slot-scope="scope"> />
<el-button <el-table-column
@click="handleWatchSearchJumin(scope.$index)" v-for="item in searchJumin.header"
type="text" :key="item.columnName"
size="small" :prop="item.columnName"
>查看</el-button :label="item.label"
> align="center"
</template> :show-overflow-tooltip="true"
</el-table-column> :width="
</el-table> item.itemType === 'radio' ? computedWidth(item.label) : 180
"
<div> >
<el-pagination <template slot-scope="scope">
@size-change="handleSizeChangeSearchJumin" <span>{{ handleFilterSpan(scope.row, item) }}</span>
@current-change="handleCurrentChangeSearchJumin" </template>
:current-page.sync="searchJumin.pageNo" </el-table-column>
:page-sizes="[20, 50, 100, 200]" <el-table-column fixed="right" label="操作" align="center">
:page-size="parseInt(searchJumin.pageSize)" <template slot-scope="scope">
layout="sizes, prev, pager, next" <el-button
:total="searchJumin.total" @click="handleWatchSearchJumin(scope.$index)"
type="text"
size="small"
>查看</el-button
>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@size-change="handleSizeChangeSearchJumin"
@current-change="handleCurrentChangeSearchJumin"
:current-page.sync="searchJumin.pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(searchJumin.pageSize)"
layout="sizes, prev, pager, next"
:total="searchJumin.total"
>
</el-pagination>
</div>
</div>
</div>
<div
class="m-tb"
v-if="
searchData.type == 'fangwu' &&
searchData.keyword != '' &&
searchStatus == 'ing'
"
>
<div class="tb">
<el-table
:data="searchFangwu.list"
v-loading="searchFangwu.loading"
border
:max-height="1000"
style="width: 100%"
> >
</el-pagination> <el-table-column
label="序号"
type="index"
align="center"
width="50"
/>
<el-table-column prop="houseName" label="房屋名称" width="120">
</el-table-column>
<el-table-column
prop="neighborHoodName"
label="所属小区"
width="160"
>
</el-table-column>
<el-table-column prop="buildingName" label="所属楼栋">
</el-table-column>
<el-table-column prop="unitNum" label="单元号">
</el-table-column>
<el-table-column prop="doorName" label="门牌号">
</el-table-column>
<el-table-column prop="houseType" label="类型">
</el-table-column>
<el-table-column prop="purpose" label="用途"> </el-table-column>
<el-table-column prop="rentFlag" label="是否出租">
</el-table-column>
<el-table-column prop="ownerName" label="房主姓名">
</el-table-column>
<el-table-column prop="ownerPhone" label="房主电话" width="110">
</el-table-column>
<el-table-column prop="ownerIdCard" label="身份证" width="170">
</el-table-column>
<el-table-column
label="操作"
fixed="right"
header-align="center"
align="center"
class="operate"
>
<template slot-scope="scope">
<el-button
type="text"
style="color: #1c6afd; text-decoration: underline"
size="small"
@click="handleWatchSearchFangwu(scope.row)"
>查看</el-button
>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@size-change="handleSizeChangeSearchFangwu"
@current-change="handleCurrentChangeSearchFangwu"
:current-page.sync="searchFangwu.pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(searchFangwu.pageSize)"
layout="sizes, prev, pager, next"
:total="searchFangwu.total"
>
</el-pagination>
</div>
</div> </div>
</div> </div>
</div>
<div <div
class="m-tb" class="m-tb"
v-if=" v-if="
searchData.type == 'fangwu' && searchData.type == 'xuqiu' &&
searchData.keyword != '' && searchData.keyword != '' &&
searchStatus == 'ing' searchStatus == 'ing'
" "
> >
<div class="tb"> <div class="tb">
<el-table <el-table
:data="searchFangwu.list" :data="searchXuqiu.list"
v-loading="searchFangwu.loading" v-loading="searchXuqiu.loading"
border border
:max-height="1000" :max-height="1000"
style="width: 100%" style="width: 100%"
>
<el-table-column
label="序号"
type="index"
align="center"
width="50"
/>
<el-table-column prop="houseName" label="房屋名称" width="120">
</el-table-column>
<el-table-column
prop="neighborHoodName"
label="所属小区"
width="160"
> >
</el-table-column> <el-table-column
<el-table-column prop="buildingName" label="所属楼栋"> label="序号"
</el-table-column> type="index"
<el-table-column prop="unitNum" label="单元号"> </el-table-column> align="center"
<el-table-column prop="doorName" label="门牌号"> width="50"
</el-table-column> />
<el-table-column prop="houseType" label="类型"> </el-table-column>
<el-table-column prop="purpose" label="用途"> </el-table-column> <el-table-column
<el-table-column prop="rentFlag" label="是否出租"> v-for="item in searchXuqiu.header"
</el-table-column> :key="item.columnName"
<el-table-column prop="ownerName" label="房主姓名"> :prop="item.columnName"
</el-table-column> :label="item.label"
<el-table-column prop="ownerPhone" label="房主电话" width="110"> :align="item.align"
</el-table-column> :width="item.width"
<el-table-column prop="ownerIdCard" label="身份证" width="170"> :show-overflow-tooltip="true"
</el-table-column> >
<el-table-column <template slot-scope="scope">
label="操作" <span>{{ handleFilterSpan(scope.row, item) }}</span>
fixed="right" </template>
header-align="center" </el-table-column>
align="center"
class="operate" <el-table-column
label="操作"
fixed="right"
header-align="center"
align="center"
class="operate"
>
<template slot-scope="scope">
<el-button
type="text"
style="color: #1c6afd; text-decoration: underline"
size="small"
@click="handleWatchSearchXuqiu(scope.row)"
>查看</el-button
>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@size-change="handleSizeChangeSearchXuqiu"
@current-change="handleCurrentChangeSearchXuqiu"
:current-page.sync="searchXuqiu.pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(searchXuqiu.pageSize)"
layout="sizes, prev, pager, next"
:total="searchXuqiu.total"
>
</el-pagination>
</div>
</div>
</div>
<div
class="m-tb"
v-if="
searchData.type == 'xuqiu' &&
searchData.keyword != '' &&
searchStatus == 'ing'
"
>
<div class="tb"></div>
</div>
<div class="m-list" v-if="searchStatus == 'ini'">
<div class="list-title">常用功能</div>
<div class="list">
<div
class="item"
:key="item.menuId"
@click="handleClickFunc(item)"
v-for="item in funcList"
> >
<template slot-scope="scope"> <div class="icon">
<el-button <svg
type="text" class="icon-svg aui-sidebar__menu-icon"
style="color: #1c6afd; text-decoration: underline" aria-hidden="true"
size="small"
@click="handleWatchSearchFangwu(scope.row)"
>查看</el-button
> >
</template> <use :xlink:href="`#${item.icon}`" />
</el-table-column> </svg>
</el-table> </div>
<div> <p>{{ item.menuName }}</p>
<el-pagination </div>
@size-change="handleSizeChangeSearchFangwu"
@current-change="handleCurrentChangeSearchFangwu" <div class="item" @click="showedFuncPanel = true">
:current-page.sync="searchFangwu.pageNo" <div class="icon">
:page-sizes="[20, 50, 100, 200]" <img src="@/assets/img/shequ/function/tianjiayingyong.png" />
:page-size="parseInt(searchFangwu.pageSize)" </div>
layout="sizes, prev, pager, next" <p>添加应用</p>
:total="searchFangwu.total" </div>
>
</el-pagination>
</div> </div>
</div> </div>
</div> </div>
</div>
<div <div class="m-data" v-if="searchStatus == 'ini'">
class="m-tb" <div class="wrap">
v-if=" <div class="headline">人员预警</div>
searchData.type == 'xuqiu' &&
searchData.keyword != '' && <div class="cnt">
searchStatus == 'ing' <div class="chart">
" <pan-chart
> :width="520"
<div class="tb"> :height="420"
<el-table v-if="warningChart.loading"
:data="searchXuqiu.list" :total="warningChart.total"
v-loading="searchXuqiu.loading" :list="warningChart.list"
border
:max-height="1000"
style="width: 100%"
>
<el-table-column
label="序号"
type="index"
align="center"
width="50"
/> />
</div>
<el-table-column <div class="tb">
v-for="item in searchXuqiu.header" <el-table
:key="item.columnName" :data="warningTb.list"
:prop="item.columnName" border
:label="item.label" style="width: 100%"
:align="item.align" class="resi-table"
:width="item.width" :max-height="maxTableHeight"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<span>{{ handleFilterSpan(scope.row, item) }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
fixed="right"
header-align="center"
align="center"
class="operate"
>
<template slot-scope="scope">
<el-button
type="text"
style="color: #1c6afd; text-decoration: underline"
size="small"
@click="handleWatchSearchXuqiu(scope.row)"
>查看</el-button
>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@size-change="handleSizeChangeSearchXuqiu"
@current-change="handleCurrentChangeSearchXuqiu"
:current-page.sync="searchXuqiu.pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(searchXuqiu.pageSize)"
layout="sizes, prev, pager, next"
:total="searchXuqiu.total"
> >
</el-pagination> <el-table-column
label="序号"
type="index"
align="center"
width="50"
/>
<el-table-column prop="typeName" label="类型">
</el-table-column>
<el-table-column prop="gridName" label="所属网格">
</el-table-column>
<el-table-column prop="name" label="姓名"> </el-table-column>
<el-table-column prop="family" label="所属家庭">
</el-table-column>
<el-table-column prop="mobile" label="电话"> </el-table-column>
<el-table-column fixed="right" label="操作" align="center">
<template slot-scope="scope">
<el-button
@click="handleWatchWarning(scope.$index)"
type="text"
size="small"
>查看</el-button
>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@size-change="handleSizeChangeWarning"
@current-change="handleCurrentChangeWarning"
:current-page.sync="warningTb.pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(warningTb.pageSize)"
layout="sizes, prev, pager, next"
:total="warningTb.total"
>
</el-pagination>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<!-- 修改弹出框 -->
<div v-show="showedFuncPanel">
<div class="m-panel">
<div <div
class="m-tb" class="m-list"
v-if=" v-if="selectedFuncList && selectedFuncList.length > 0"
searchData.type == 'xuqiu' &&
searchData.keyword != '' &&
searchStatus == 'ing'
"
> >
<div class="tb"></div>
</div>
<div class="m-list" v-if="searchStatus == 'ini'">
<div class="list-title">常用功能</div> <div class="list-title">常用功能</div>
<div class="list"> <div class="list">
<div <div
class="item" class="item"
:key="item.menuId" :key="item.menuId"
@click="handleClickFunc(item)" @click="selectFuncItem(item.menuId)"
v-for="item in funcList" v-for="item in selectedFuncList"
> >
<div class="corner-mark z-on">
<i class="el-icon-success"></i>
</div>
<div class="icon"> <div class="icon">
<svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true"> <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
<use :xlink:href="`#${item.icon}`" /> <use :xlink:href="`#${item.icon}`" />
@ -271,165 +380,51 @@
</div> </div>
<p>{{ item.menuName }}</p> <p>{{ item.menuName }}</p>
</div> </div>
<div class="item" @click="showedFuncPanel = true">
<div class="icon">
<img src="@/assets/img/shequ/function/tianjiayingyong.png" />
</div>
<p>添加应用</p>
</div>
</div> </div>
</div> </div>
<!-- 修改弹出框 --> <div class="m-list">
<el-dialog <div class="list-title">所有功能</div>
:visible.sync="showedFuncPanel"
:close-on-click-modal="false" <div
:close-on-press-escape="false" :key="'one' + menu.id"
title="" v-show="menu.children && menu.children.length > 0"
width="850px" v-for="menu in $store.state.sidebarMenuList"
top="5vh" >
@closed="showedFuncPanel = false" <div class="list-title2">{{ menu.name }}</div>
> <div class="list">
<div class="m-panel"> <div
<div class="item"
class="m-list" :key="'two' + item.id"
v-if="selectedFuncList && selectedFuncList.length > 0" @click="selectFuncItem(item.id)"
> v-for="item in menu.children"
<div class="list-title">常用功能</div> >
<div class="list">
<div <div
class="item" class="corner-mark"
:key="item.menuId" :class="{
@click="selectFuncItem(item.menuId)" 'z-on': selectedFuncIdList.indexOf(item.id) !== -1,
v-for="item in selectedFuncList" }"
> >
<div class="corner-mark z-on"> <i class="el-icon-success"></i>
<i class="el-icon-success"></i>
</div>
<div class="icon">
<svg
class="icon-svg aui-sidebar__menu-icon"
aria-hidden="true"
>
<use :xlink:href="`#${item.icon}`" />
</svg>
</div>
<p>{{ item.menuName }}</p>
</div> </div>
</div>
</div>
<div class="m-list">
<div class="list-title">所有功能</div>
<div <div class="icon">
:key="'one' + menu.id" <svg
v-show="menu.children && menu.children.length > 0" class="icon-svg aui-sidebar__menu-icon"
v-for="menu in $store.state.sidebarMenuList" aria-hidden="true"
>
<div class="list-title2">{{ menu.name }}</div>
<div class="list">
<div
class="item"
:key="'two' + item.id"
@click="selectFuncItem(item.id)"
v-for="item in menu.children"
> >
<div <use :xlink:href="`#${item.icon}`" />
class="corner-mark" </svg>
:class="{
'z-on': selectedFuncIdList.indexOf(item.id) !== -1,
}"
>
<i class="el-icon-success"></i>
</div>
<div class="icon">
<svg
class="icon-svg aui-sidebar__menu-icon"
aria-hidden="true"
>
<use :xlink:href="`#${item.icon}`" />
</svg>
</div>
<p>{{ item.name }}</p>
</div>
</div> </div>
<p>{{ item.name }}</p>
</div> </div>
</div> </div>
<div class="operate">
<el-button round @click="showedFuncPanel = false">取消</el-button>
<el-button type="primary" round @click="editFuncList"
>确认</el-button
>
</div>
</div> </div>
</el-dialog> </div>
</div>
</div>
<div class="m-data" v-if="searchStatus == 'ini'"> <div class="operate">
<div class="wrap"> <el-button round @click="showedFuncPanel = false">返回</el-button>
<div class="headline">人员预警</div> <el-button type="primary" round @click="editFuncList">确认</el-button>
<div class="cnt">
<div class="chart">
<pan-chart
:width="520"
:height="420"
v-if="warningChart.loading"
:total="warningChart.total"
:list="warningChart.list"
/>
</div>
<div class="tb">
<el-table
:data="warningTb.list"
border
style="width: 100%"
class="resi-table"
:max-height="maxTableHeight"
>
<el-table-column
label="序号"
type="index"
align="center"
width="50"
/>
<el-table-column prop="typeName" label="类型"> </el-table-column>
<el-table-column prop="gridName" label="所属网格">
</el-table-column>
<el-table-column prop="name" label="姓名"> </el-table-column>
<el-table-column prop="family" label="所属家庭">
</el-table-column>
<el-table-column prop="mobile" label="电话"> </el-table-column>
<el-table-column fixed="right" label="操作" align="center">
<template slot-scope="scope">
<el-button
@click="handleWatchWarning(scope.$index)"
type="text"
size="small"
>查看</el-button
>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@size-change="handleSizeChangeWarning"
@current-change="handleCurrentChangeWarning"
:current-page.sync="warningTb.pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(warningTb.pageSize)"
layout="sizes, prev, pager, next"
:total="warningTb.total"
>
</el-pagination>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

32
src/views/modules/visual/warning/components/screen-table/index.vue
View File

@ -25,7 +25,7 @@
> >
<div v-if="Array.isArray(item)"> <div v-if="Array.isArray(item)">
<span <span
v-show="rIndex < 1" v-show="rIndex < 3"
:key="resi.userId" :key="resi.userId"
v-for="(resi, rIndex) in item" v-for="(resi, rIndex) in item"
> >
@ -35,7 +35,7 @@
</div> </div>
<span v-else>{{ item }}</span> <span v-else>{{ item }}</span>
<span <span
v-if="indexs + 1 == value.length && item.length > 1" v-if="indexs + 1 == value.length && item.length > 3"
class="more" class="more"
@click.stop="onClickMorePop(index)" @click.stop="onClickMorePop(index)"
ref="morePop" ref="morePop"
@ -231,7 +231,19 @@ export default {
&-th { &-th {
text-align: center; text-align: center;
width: calc(100% / 5); width: 20%;
&:nth-child(1) {
width: 5%;
}
&:nth-child(2) {
width: 25%;
}
&:nth-child(3) {
width: 25%;
}
&:nth-child(5) {
width: 25%;
}
} }
} }
@ -253,7 +265,19 @@ export default {
.td { .td {
text-align: center; text-align: center;
width: calc(100% / 5); width: 20%;
&:nth-child(1) {
width: 5%;
}
&:nth-child(2) {
width: 25%;
}
&:nth-child(3) {
width: 25%;
}
&:nth-child(5) {
width: 25%;
}
a { a {
cursor: pointer; cursor: pointer;
} }

Write Preview
Loading…
Cancel
Save