kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

Browse Source
This commit is contained in:
liuye
2022-06-28 11:54:32 +08:00
parent 7ae4e92a93 d5fe146cec
commit 1605d280b8
3 changed files with 292 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
packages/conv/AppReportAiWill/components/List.vue
View File

@@ -34,6 +34,7 @@
<el-table-column slot="options" label="操作" fixed="right" width="120" align="center"> <el-table-column slot="options" label="操作" fixed="right" width="120" align="center">
<div class="table-options" slot-scope="{row}"> <div class="table-options" slot-scope="{row}">
<el-button type="text" title="详情" @click="toDetail(row.id)">详情</el-button> <el-button type="text" title="详情" @click="toDetail(row.id)">详情</el-button>
<el-button type="text" title="删除" @click="handleDelete(row.id)">删除</el-button>
</div> </div>
</el-table-column> </el-table-column>
</ai-table> </ai-table>
@@ -42,9 +43,9 @@
</template> </template>
<script> <script>
import { mapState } from 'vuex' import {mapState} from 'vuex'
export default { export default {
name: 'List', name: 'List',
label: "随手拍", label: "随手拍",
@@ -74,15 +75,15 @@
colConfigs() { colConfigs() {
return [ return [
{ prop: 'content', label: '内容描述', width: '300px' }, {prop: 'content', label: '内容描述', width: '300px'},
{ prop: 'groupName', label: '事件类型', align: 'center' }, {prop: 'groupName', label: '事件类型', align: 'center'},
{ prop: 'girdName', label: '所属网格', align: 'center' }, {prop: 'girdName', label: '所属网格', align: 'center'},
{ prop: 'createTime', label: '上报时间', align: 'center' }, {prop: 'createTime', label: '上报时间', align: 'center'},
{ prop: 'name', label: '上报居民', align: 'center' }, {prop: 'name', label: '上报居民', align: 'center'},
{ prop: 'phone', label: '联系方式', align: 'center' }, {prop: 'phone', label: '联系方式', align: 'center'},
{ prop: 'eventStatus', label: '处理状态', align: 'center', formart: v => this.dict.getLabel('clapEventStatus', v) }, {prop: 'eventStatus', label: '处理状态', align: 'center', formart: v => this.dict.getLabel('clapEventStatus', v)},
{ prop: 'processTime', label: '处理时长', align: 'center' }, {prop: 'processTime', label: '处理时长', align: 'center'},
{ slot: 'options' } {slot: 'options'}
] ]
}, },
@@ -91,14 +92,14 @@
} }
}, },
created () { created() {
this.dict.load('clapEventStatus').then(() => { this.dict.load('clapEventStatus').then(() => {
this.getList() this.getList()
}) })
}, },
methods: { methods: {
getList () { getList() {
this.instance.post(`/app/appclapeventinfo/list`, null, { this.instance.post(`/app/appclapeventinfo/list`, null, {
params: { params: {
...this.search ...this.search
@@ -111,7 +112,7 @@
}) })
}, },
toDetail (id) { toDetail(id) {
this.$emit('change', { this.$emit('change', {
type: 'Detail', type: 'Detail',
params: { params: {
@@ -120,16 +121,30 @@
}) })
}, },
toSetting () { toSetting() {
this.$emit('change', { this.$emit('change', {
type: 'Setting', type: 'Setting',
params: { params: {
id: '' id: ''
} }
}) })
},
handleDelete(ids) {
this.$confirm("是否要进行删除?").then(() => {
this.$instance.post("/app/appclapeventinfo/delete", null, {
params: {ids}
}).then(res => {
if (res?.code == 0) {
this.$u.toast("删除成功!")
this.current = 1
this.isMore = false
this.getList()
}
})
}).catch(() => 0)
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

87
packages/grid/AppBuildMap/buildingStatistics.vue
View File

@@ -1,20 +1,21 @@
<template> <template>
<section class="buildingStatistics"> <section class="buildingStatistics">
<ai-title v-if="!isFormDv" title="楼栋统计" isShowBack isShowBottomBorder @onBackClick="$router.push({query:{}}),$parent.info={},$parent.isShowInfo=false,$parent.house=null,$parent.chooseBuildId=''"/> <ai-title v-if="!isFormDv" title="楼栋统计" isShowBack isShowBottomBorder
@onBackClick="$router.push({query:{}}),$parent.info={},$parent.isShowInfo=false,$parent.house=null,$parent.chooseBuildId=''"/>
<div class="buildingPane"> <div class="buildingPane">
<div class="bgItem tree"/> <div class="bgItem tree"/>
<div class="building"> <div class="building">
<template v-if="floorRooms.length>0"> <template v-if="floorRooms.length>0">
<div class="buildingSignboard">{{ `${currentBuilding.buildingNumber}栋 ${unitNumber}单元` }} <div class="buildingSignboard" v-text="`${currentBuilding.buildingNumber}栋 ${unitNumber}单元`"/>
</div>
<el-scrollbar class="floors"> <el-scrollbar class="floors">
<div class="floor" v-for="(fl,j) in floorRooms" :key="j"> <div class="floor" v-for="(fl,j) in floorRooms" :key="j">
<div class="room" v-for="(op,i) in fl" :key="op.id" @click="handleSelectRoom(op,$event)" @touchstart="handleSelectRoom(op,$event)" :class="[{none:op.livingNumber==0,selected:selected.houseCode==op.houseCode},handleTipsHighlight(op.tips)]"> <div class="room" v-for="op in fl" :key="op.id" @click="handleSelectRoom(op,$event)" @touchstart="handleSelectRoom(op,$event)"
:class="[{none:op.livingNumber==0,selected:selected.houseCode==op.houseCode},handleTipsHighlight(op.tips)]">
{{ op.houseCode }} {{ op.houseCode }}
<div v-if="op.livingNumber==0">无人</div> <div v-if="op.livingNumber==0">无人</div>
<div v-show="op.id==selected.id" class="detail" @click.stop :style="{left:position.x,top:position.y}"> <div v-show="op.id==selected.id" class="detail" @click.stop :style="{left:position.x,top:position.y}">
<el-row class="popupHeader" type="flex" justify="space-between" align="middle"> <el-row class="popupHeader" type="flex" justify="space-between" align="middle">
<span>{{selected.houseCode}}详情</span> <span>{{ selected.houseCode }}详情</span>
<ai-icon icon="iconClean" @click.native.stop="selected={}"/> <ai-icon icon="iconClean" @click.native.stop="selected={}"/>
</el-row> </el-row>
<div class="family-member"> <div class="family-member">
@@ -22,31 +23,31 @@
<div v-for="(item,index) in selected.owner" :key="item.id"> <div v-for="(item,index) in selected.owner" :key="item.id">
<div class="family-member__item"> <div class="family-member__item">
<div class="member-left"> <div class="member-left">
<label>{{item.name}}</label> <label>{{ item.name }}</label>
</div> </div>
<span style="color: #2266FF">{{root.dict.getLabel("houseLivingType",item.livingType)}}</span> <span style="color: #2266FF">{{ root.dict.getLabel("houseLivingType", item.livingType) }}</span>
</div> </div>
<div class="family-member__item"> <div class="family-member__item">
<div class="member-left"> <div class="member-left">
<label>联系方式</label> <label>联系方式</label>
</div> </div>
<span style="color: #2266FF;">{{item.phone}}</span> <span style="color: #2266FF;">{{ item.phone }}</span>
</div> </div>
</div> </div>
<h2>承租人信息</h2> <h2>承租人信息</h2>
<div v-for="(item,index) in selected.renter" :key="item.id"> <div v-for="(item,index) in selected.renter" :key="item.id">
<div class="family-member__item" > <div class="family-member__item">
<div class="member-left"> <div class="member-left">
<label>{{item.name}}</label> <label>{{ item.name }}</label>
</div> </div>
<span style="color: #2266FF">{{root.dict.getLabel("houseLivingType",item.livingType)}}</span> <span style="color: #2266FF">{{ root.dict.getLabel("houseLivingType", item.livingType) }}</span>
</div> </div>
<div class="family-member__item"> <div class="family-member__item">
<div class="member-left"> <div class="member-left">
<label>联系方式</label> <label>联系方式</label>
</div> </div>
<span>{{item.phone}}</span> <span>{{ item.phone }}</span>
</div> </div>
</div> </div>
@@ -54,9 +55,9 @@
<div v-for="(item,index) in selected.live" :key="item.id"> <div v-for="(item,index) in selected.live" :key="item.id">
<div class="family-member__item"> <div class="family-member__item">
<div class="member-left"> <div class="member-left">
<label>{{item.name}}</label> <label>{{ item.name }}</label>
</div> </div>
<span>{{root.dict.getLabel("householdRelation",item.relation)}}</span> <span>{{ root.dict.getLabel("householdRelation", item.relation) }}</span>
</div> </div>
</div> </div>
</div> </div>
@@ -68,7 +69,7 @@
<ai-empty v-else>请在【<b>小区总览</b>】中选取【楼栋单元】</ai-empty> <ai-empty v-else>请在【<b>小区总览</b>】中选取【楼栋单元】</ai-empty>
<div class="bottom"/> <div class="bottom"/>
</div> </div>
<building-tool-bar></building-tool-bar> <building-tool-bar/>
</div> </div>
</section> </section>
</template> </template>
@@ -96,11 +97,11 @@ export default {
rooms: [], rooms: [],
selected: {}, selected: {},
currentBuilding: {}, currentBuilding: {},
unitNumber:1, unitNumber: 1,
tips: [], tips: [],
position:{ position: {
x:"", x: "",
y:"" y: ""
}, },
} }
}, },
@@ -115,23 +116,23 @@ export default {
} }
}, },
created() { created() {
this.dict.load('householdRelation', 'residentTipType',"houseLivingType") this.dict.load('householdRelation', 'residentTipType', "houseLivingType")
if (this.isFormDv && this.query.buildingId) { if (this.isFormDv && this.query.buildingId) {
this.getRoomsByBuilding(this.query.buildingId, this.query.unitNum) this.getRoomsByBuilding(this.query.buildingId, this.query.unitNum)
this.currentBuilding = { buildingNumber: this.query.buildingNumber} this.currentBuilding = {buildingNumber: this.query.buildingNumber}
this.unitNumber = this.query.unitNum this.unitNumber = this.query.unitNum
return false return false
} }
this.getRoomsByBuilding(this.$route.query?.buildingId,this.$route.query?.unitNum) this.getRoomsByBuilding(this.$route.query?.buildingId, this.$route.query?.unitNum)
this.currentBuilding = {buildingNumber: this.$route.query?.buildingNumber}; this.currentBuilding = {buildingNumber: this.$route.query?.buildingNumber};
this.unitNumber = this.$route.query?.unitNum; this.unitNumber = this.$route.query?.unitNum;
}, },
methods: { methods: {
handleSelectRoom(room, e) { handleSelectRoom(room, e) {
console.log(e) console.log(e)
if (room.livingNumber>0) { if (room.livingNumber > 0) {
this.$nextTick(()=>{ this.$nextTick(() => {
this.position.x = e.pageX + 40 + "px" this.position.x = e.pageX + 40 + "px"
this.position.y = e.pageY + "px" this.position.y = e.pageY + "px"
this.selected = room; this.selected = room;
@@ -140,15 +141,17 @@ export default {
// this.getRoomDetail(room.id) // this.getRoomDetail(room.id)
} }
}, },
selectedBuilding(building,unitNumber) { selectedBuilding(building, unitNumber) {
this.selected = {} this.selected = {}
this.tips = [] this.tips = []
this.$router.push({query: {...this.$route.query, buildingId: building.id,unitNum:unitNumber}}).catch(e=>{e}) this.$router.push({query: {...this.$route.query, buildingId: building.id, unitNum: unitNumber}}).catch(e => {
e
})
this.currentBuilding = building this.currentBuilding = building
this.unitNumber = unitNumber this.unitNumber = unitNumber
this.getRoomsByBuilding(building.id,unitNumber) this.getRoomsByBuilding(building.id, unitNumber)
}, },
getRoomsByBuilding(buildingId,unitNumber) { getRoomsByBuilding(buildingId, unitNumber) {
this.root.instance.post("/app/appcommunityhouseinfo/list", null, { this.root.instance.post("/app/appcommunityhouseinfo/list", null, {
params: { params: {
unitNumber, unitNumber,
@@ -197,7 +200,7 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
::v-deep .ailist-title{ ::v-deep .ailist-title {
margin: 0 20px; margin: 0 20px;
} }
@@ -337,29 +340,37 @@ export default {
::v-deep .floors { ::v-deep .floors {
max-height: 520px; max-height: 520px;
max-width: 60vw;
margin: 0 20px;
padding: 0 50px;
position: relative;
.el-scrollbar__wrap { &:before {
overflow-x: hidden; display: block;
margin-bottom: 0 !important; content: " ";
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
background-image: url("https://cdn.cunwuyun.cn/buildSta/floor.png");
background-size: 100% 105px;
} }
} }
.floor { .floor {
margin: 0 20px; position: relative;
height: 105px; height: 105px;
flex-shrink: 0;
max-width: calc(100% - 40px);
display: flex; display: flex;
flex-shrink: 0;
align-items: center; align-items: center;
background-image: url("https://cdn.cunwuyun.cn/buildSta/floor.png");
background-size: 100% 105px;
padding: 0 30px;
box-sizing: border-box; box-sizing: border-box;
gap: 20px; gap: 20px;
.room { .room {
width: 60px; width: 60px;
height: 72px; height: 72px;
flex-shrink: 0;
background-image: url("https://cdn.cunwuyun.cn/buildSta/room.png"); background-image: url("https://cdn.cunwuyun.cn/buildSta/room.png");
text-align: center; text-align: center;
padding-top: 20px; padding-top: 20px;

87
project/sass/apps/AppHouseMap/buildingStatistics.vue
View File

@@ -1,20 +1,21 @@
<template> <template>
<section class="buildingStatistics"> <section class="buildingStatistics">
<ai-title v-if="!isFormDv" title="楼栋统计" isShowBack isShowBottomBorder @onBackClick="$router.push({query:{}}),$parent.info={},$parent.isShowInfo=false,$parent.house=null,$parent.chooseBuildId='',$parent.showStatistics=false, $parent.type='0'"/> <ai-title v-if="!isFormDv" title="楼栋统计" isShowBack isShowBottomBorder
@onBackClick="$router.push({query:{}}),$parent.info={},$parent.isShowInfo=false,$parent.house=null,$parent.chooseBuildId='',$parent.showStatistics=false, $parent.type='0'"/>
<div class="buildingPane"> <div class="buildingPane">
<div class="bgItem tree"/> <div class="bgItem tree"/>
<div class="building"> <div class="building">
<template v-if="floorRooms.length>0"> <template v-if="floorRooms.length>0">
<div class="buildingSignboard">{{ `${currentBuilding.buildingNumber}栋 ${unitNumber}单元` }} <div class="buildingSignboard" v-text="`${currentBuilding.buildingNumber}栋 ${unitNumber}单元`"/>
</div>
<el-scrollbar class="floors"> <el-scrollbar class="floors">
<div class="floor" v-for="(fl,j) in floorRooms" :key="j"> <div class="floor" v-for="(fl,j) in floorRooms" :key="j">
<div class="room" v-for="(op,i) in fl" :key="op.id" @click="handleSelectRoom(op,$event)" @touchstart="handleSelectRoom(op,$event)" :class="[{none:op.livingNumber==0,selected:selected.houseCode==op.houseCode},handleTipsHighlight(op.tips)]"> <div class="room" v-for="op in fl" :key="op.id" @click="handleSelectRoom(op,$event)" @touchstart="handleSelectRoom(op,$event)"
:class="[{none:op.livingNumber==0,selected:selected.houseCode==op.houseCode},handleTipsHighlight(op.tips)]">
{{ op.houseCode }} {{ op.houseCode }}
<div v-if="op.livingNumber==0">无人</div> <div v-if="op.livingNumber==0">无人</div>
<div v-show="op.id==selected.id" class="detail" @click.stop :style="{left:position.x,top:position.y}"> <div v-show="op.id==selected.id" class="detail" @click.stop :style="{left:position.x,top:position.y}">
<el-row class="popupHeader" type="flex" justify="space-between" align="middle"> <el-row class="popupHeader" type="flex" justify="space-between" align="middle">
<span>{{selected.houseCode}}详情</span> <span>{{ selected.houseCode }}详情</span>
<ai-icon icon="iconClean" @click.native.stop="selected={}"/> <ai-icon icon="iconClean" @click.native.stop="selected={}"/>
</el-row> </el-row>
<div class="family-member"> <div class="family-member">
@@ -22,31 +23,31 @@
<div v-for="(item,index) in selected.owner" :key="item.id"> <div v-for="(item,index) in selected.owner" :key="item.id">
<div class="family-member__item"> <div class="family-member__item">
<div class="member-left"> <div class="member-left">
<label>{{item.name}}</label> <label>{{ item.name }}</label>
</div> </div>
<span style="color: #2266FF">{{root.dict.getLabel("houseLivingType",item.livingType)}}</span> <span style="color: #2266FF">{{ root.dict.getLabel("houseLivingType", item.livingType) }}</span>
</div> </div>
<div class="family-member__item"> <div class="family-member__item">
<div class="member-left"> <div class="member-left">
<label>联系方式</label> <label>联系方式</label>
</div> </div>
<span style="color: #2266FF;">{{item.phone}}</span> <span style="color: #2266FF;">{{ item.phone }}</span>
</div> </div>
</div> </div>
<h2>承租人信息</h2> <h2>承租人信息</h2>
<div v-for="(item,index) in selected.renter" :key="item.id"> <div v-for="(item,index) in selected.renter" :key="item.id">
<div class="family-member__item" > <div class="family-member__item">
<div class="member-left"> <div class="member-left">
<label>{{item.name}}</label> <label>{{ item.name }}</label>
</div> </div>
<span style="color: #2266FF">{{root.dict.getLabel("houseLivingType",item.livingType)}}</span> <span style="color: #2266FF">{{ root.dict.getLabel("houseLivingType", item.livingType) }}</span>
</div> </div>
<div class="family-member__item"> <div class="family-member__item">
<div class="member-left"> <div class="member-left">
<label>联系方式</label> <label>联系方式</label>
</div> </div>
<span>{{item.phone}}</span> <span>{{ item.phone }}</span>
</div> </div>
</div> </div>
@@ -54,9 +55,9 @@
<div v-for="(item,index) in selected.live" :key="item.id"> <div v-for="(item,index) in selected.live" :key="item.id">
<div class="family-member__item"> <div class="family-member__item">
<div class="member-left"> <div class="member-left">
<label>{{item.name}}</label> <label>{{ item.name }}</label>
</div> </div>
<span>{{root.dict.getLabel("householdRelation",item.relation)}}</span> <span>{{ root.dict.getLabel("householdRelation", item.relation) }}</span>
</div> </div>
</div> </div>
</div> </div>
@@ -68,7 +69,7 @@
<ai-empty v-else>请在【<b>小区总览</b>】中选取【楼栋单元】</ai-empty> <ai-empty v-else>请在【<b>小区总览</b>】中选取【楼栋单元】</ai-empty>
<div class="bottom"/> <div class="bottom"/>
</div> </div>
<building-tool-bar></building-tool-bar> <building-tool-bar/>
</div> </div>
</section> </section>
</template> </template>
@@ -96,11 +97,11 @@ export default {
rooms: [], rooms: [],
selected: {}, selected: {},
currentBuilding: {}, currentBuilding: {},
unitNumber:1, unitNumber: 1,
tips: [], tips: [],
position:{ position: {
x:"", x: "",
y:"" y: ""
}, },
} }
}, },
@@ -115,23 +116,23 @@ export default {
} }
}, },
created() { created() {
this.dict.load('householdRelation', 'residentTipType',"houseLivingType") this.dict.load('householdRelation', 'residentTipType', "houseLivingType")
if (this.isFormDv && this.query.buildingId) { if (this.isFormDv && this.query.buildingId) {
this.getRoomsByBuilding(this.query.buildingId, this.query.unitNum) this.getRoomsByBuilding(this.query.buildingId, this.query.unitNum)
this.currentBuilding = { buildingNumber: this.query.buildingNumber} this.currentBuilding = {buildingNumber: this.query.buildingNumber}
this.unitNumber = this.query.unitNum this.unitNumber = this.query.unitNum
return false return false
} }
this.getRoomsByBuilding(this.$route.query?.buildingId,this.$route.query?.unitNum) this.getRoomsByBuilding(this.$route.query?.buildingId, this.$route.query?.unitNum)
this.currentBuilding = {buildingNumber: this.$route.query?.buildingNumber}; this.currentBuilding = {buildingNumber: this.$route.query?.buildingNumber};
this.unitNumber = this.$route.query?.unitNum; this.unitNumber = this.$route.query?.unitNum;
}, },
methods: { methods: {
handleSelectRoom(room, e) { handleSelectRoom(room, e) {
console.log(e) console.log(e)
if (room.livingNumber>0) { if (room.livingNumber > 0) {
this.$nextTick(()=>{ this.$nextTick(() => {
this.position.x = e.pageX + 40 + "px" this.position.x = e.pageX + 40 + "px"
this.position.y = e.pageY + "px" this.position.y = e.pageY + "px"
this.selected = room; this.selected = room;
@@ -140,15 +141,17 @@ export default {
// this.getRoomDetail(room.id) // this.getRoomDetail(room.id)
} }
}, },
selectedBuilding(building,unitNumber) { selectedBuilding(building, unitNumber) {
this.selected = {} this.selected = {}
this.tips = [] this.tips = []
this.$router.push({query: {...this.$route.query, buildingId: building.id,unitNum:unitNumber}}).catch(e=>{e}) this.$router.push({query: {...this.$route.query, buildingId: building.id, unitNum: unitNumber}}).catch(e => {
e
})
this.currentBuilding = building this.currentBuilding = building
this.unitNumber = unitNumber this.unitNumber = unitNumber
this.getRoomsByBuilding(building.id,unitNumber) this.getRoomsByBuilding(building.id, unitNumber)
}, },
getRoomsByBuilding(buildingId,unitNumber) { getRoomsByBuilding(buildingId, unitNumber) {
this.root.instance.post("/app/appcommunityhouseinfo/list", null, { this.root.instance.post("/app/appcommunityhouseinfo/list", null, {
params: { params: {
unitNumber, unitNumber,
@@ -197,7 +200,7 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
::v-deep .ailist-title{ ::v-deep .ailist-title {
margin: 0 20px; margin: 0 20px;
} }
@@ -337,29 +340,37 @@ export default {
::v-deep .floors { ::v-deep .floors {
max-height: 520px; max-height: 520px;
max-width: 60vw;
margin: 0 20px;
padding: 0 50px;
position: relative;
.el-scrollbar__wrap { &:before {
overflow-x: hidden; display: block;
margin-bottom: 0 !important; content: " ";
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
background-image: url("https://cdn.cunwuyun.cn/buildSta/floor.png");
background-size: 100% 105px;
} }
} }
.floor { .floor {
margin: 0 20px; position: relative;
height: 105px; height: 105px;
flex-shrink: 0;
max-width: calc(100% - 40px);
display: flex; display: flex;
flex-shrink: 0;
align-items: center; align-items: center;
background-image: url("https://cdn.cunwuyun.cn/buildSta/floor.png");
background-size: 100% 105px;
padding: 0 30px;
box-sizing: border-box; box-sizing: border-box;
gap: 20px; gap: 20px;
.room { .room {
width: 60px; width: 60px;
height: 72px; height: 72px;
flex-shrink: 0;
background-image: url("https://cdn.cunwuyun.cn/buildSta/room.png"); background-image: url("https://cdn.cunwuyun.cn/buildSta/room.png");
text-align: center; text-align: center;
padding-top: 20px; padding-top: 20px;