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

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

Browse Source
This commit is contained in:
yanran200730
2023-05-09 15:23:47 +08:00
parent c3ad840e0c 46e5ac38dc
commit 56e330588f
4 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/device/AppMediaManage/components/Play.vue
View File

@@ -161,7 +161,6 @@ export default {
},
areaRootId: '',
mediaList: [],
equipmentList: [],
detailDialog: false,
isAll: false,
input3: '',
@@ -198,15 +197,12 @@ export default {
created() {
this.dict.load('dlbMessageUrgency', 'dlbBroadTaskType', 'dlbDyclingType')
Promise.all([this.getEquipmentList(), this.getMediaList()]).then(() => {
Promise.all([this.getMediaList()]).then(() => {
this.formData.mediaId = this.params.id
this.userAreaId = this.user.info.areaId
})
},
methods: {
// 选择设备
getSelect() {
},
getMediaList() {
return this.instance.post(`/app/appdlbresource/list?current=1&size=10000`).then((res) => {
if (res?.data) {
@@ -217,16 +213,6 @@ export default {
}
})
},
getEquipmentList() {
return this.instance.post(`/app/appdlbquipment/getDlbDeviceList?current=1&size=10000&devStatus=5`).then((res) => {
if (res?.data) {
this.equipmentList = res.data.records?.map((item) => ({
dictName: item.deviceName,
dictValue: item.serialNo
})) || []
}
})
},
// 地区选择
handleAreaSelect(v) {
this.areaName = v?.[0]?.label

57
project/wuxi/app/AppReportAiWill/components/Detail.vue
View File

@@ -20,8 +20,8 @@
<ai-info-item label="当前状态" :value="dict.getLabel('clapEventStatus', detail.eventStatus)"></ai-info-item>
<ai-info-item label="联系方式">{{ detail.phone }}</ai-info-item>
<ai-info-item label="上报时间">{{ detail.createTime }}</ai-info-item>
<ai-info-item label="事件来源">{{ detail.groupName }}</ai-info-item>
<ai-info-item label="事件类型">{{ detail.groupName }} </ai-info-item>
<ai-info-item label="事件来源">{{ dict.getLabel('residentEventSource', detail.eventSource) }}</ai-info-item>
<ai-info-item label="事件类型">{{ detail.groupName }}</ai-info-item>
<ai-info-item label="事件描述" isLine>{{ detail.content }}</ai-info-item>
<ai-info-item label="现场照片" isLine>
<ai-uploader :instance="instance" disabled v-model="detail.files"></ai-uploader>
@@ -123,16 +123,16 @@
<ai-dialog
:visible.sync="isShowUser"
width="800px"
title="选择网格或网格员"
title="选择网格员"
@onConfirm="onConfirm">
<div class="grid-wrapper">
<el-input
<!-- <el-input
style="margin-bottom: 10px;"
size="small"
placeholder="请输入网格名称/网格员姓名/网格员电话"
v-model="name" @change="$refs.tree.filter(name)"
suffix-icon="iconfont iconSearch">
</el-input>
</el-input> -->
<el-tree
:filter-node-method="filterNode"
ref="tree"
@@ -210,14 +210,14 @@ export default {
created() {
this.getDict()
this.dict.load('clapEventStatus').then(() => {
this.dict.load('clapEventStatus', 'residentEventSource').then(() => {
this.getDetail()
})
},
methods: {
getDetail() {
this.instance.post('/app/appclapeventinfo/queryDetailById', null, {
this.instance.post('/app/appresidentreportinfo/queryDetailById', null, {
params: {id: this.$route.query.id}
}).then(res => {
if (res?.data) {
@@ -236,9 +236,15 @@ export default {
},
getGirdList() {
return this.instance.post(`/app/appgirdinfo/listAllByTop`).then(res => {
return this.instance.post(`/app/appresidentreportinfo/listGirdInfoByTransfer?id=${this.$route.query.id}`).then(res => {
if (res?.data) {
return this.tree = this.formatList([res.data])
// return this.tree = this.formatList([res.data])
this.tree = res.data
this.tree.map((item) => {
item.children = [item.girdMemberList?.map(e => ({
...e, isUser: true, girdName: item.girdName
})) || []].flat()
})
}
})
},
@@ -283,7 +289,7 @@ export default {
onForwardConfirm() {
this.$refs.forwardForm.validate(v => {
if (v) {
this.instance.post('/app/appclapeventinfo/transferByManager', {
this.instance.post('/app/appresidentreportinfo/transfer', {
...this.forwardForm,
id: this.$route.query.id
}).then(res => {
@@ -298,20 +304,29 @@ export default {
},
onConfirm() {
if (this.gridInfo.userId) {
this.forwardForm.girdId = this.gridInfo.girdId
this.forwardForm.girdName = this.gridInfo.girdName
this.forwardForm.girdMemberId = this.gridInfo.id
this.forwardForm.girdMemberName = this.gridInfo.name
} else {
this.forwardForm.girdId = this.gridInfo.id
}
// if (this.gridInfo.userId) {
// this.forwardForm.girdId = this.gridInfo.girdId
// this.forwardForm.girdName = this.gridInfo.girdName
// this.forwardForm.girdMemberId = this.gridInfo.id
// this.forwardForm.girdMemberName = this.gridInfo.name
// } else {
// this.forwardForm.girdId = this.gridInfo.id
// }
// this.forwardForm.girdName = this.gridInfo.girdName
// this.forwardForm.name = `${this.gridInfo.girdName}${this.gridInfo.name ? '-' + this.gridInfo.name : ''}`
// this.isShowUser = false
if(!this.gridInfo.userId) {
return this.$message.error('请选择网格员!')
}
this.forwardForm.girdId = this.gridInfo.girdId
this.forwardForm.girdName = this.gridInfo.girdName
this.forwardForm.girdMemberId = this.gridInfo.id
this.forwardForm.girdMemberName = this.gridInfo.name
this.forwardForm.name = `${this.gridInfo.girdName}${this.gridInfo.name ? '-' + this.gridInfo.name : ''}`
this.isShowUser = false
},
getDict() {
this.instance.post(`/app/appclapeventgroup/list?current=1&size=100000`).then(res => {
this.instance.post(`/app/appresidentreportgroup/list?current=1&size=100000`).then(res => {
if (res.code == 0) {
this.dictList = res.data.records.map(v => {
return {
@@ -325,7 +340,7 @@ export default {
close() {
this.$confirm('确定关闭该事件？').then(() => {
this.instance.post(`/app/appmininotice/delete?ids=${this.$route.query.id}`).then(res => {
this.instance.post(`/app/appresidentreportinfo/delete?ids=${this.$route.query.id}`).then(res => {
if (res.code == 0) {
this.$message.success('删除成功！')
this.getList()
@@ -372,7 +387,7 @@ export default {
handleEvent() {
this.$refs.form.validate(v => {
if (v) {
this.instance.post('/app/appclapeventinfo/finishByManager', {
this.instance.post('/app/appresidentreportinfo/finishByGirdMember', {
...this.form,
groupName: this.dictList.filter(v => v.dictValue === this.form.groupId)[0].dictName,
id: this.$route.query.id

8
project/wuxi/app/AppReportAiWill/components/List.vue
View File

@@ -77,7 +77,7 @@ export default {
colConfigs() {
return [
{prop: 'content', label: '内容描述', width: '300px'},
{prop: 'groupName', label: '事件来源', align: 'center'},
{prop: 'eventSource', label: '事件来源', align: 'center', dict: 'residentEventSource'},
{prop: 'groupName', label: '事件类型', align: 'center'},
{prop: 'girdName', label: '所属网格', align: 'center'},
{prop: 'createTime', label: '上报时间', align: 'center'},
@@ -95,14 +95,14 @@ export default {
},
created() {
this.dict.load('clapEventStatus').then(() => {
this.dict.load('clapEventStatus', 'residentEventSource').then(() => {
this.getList()
})
},
methods: {
getList() {
this.instance.post(`/app/appclapeventinfo/list`, null, {
this.instance.post(`/app/appresidentreportinfo/list`, null, {
params: {
...this.search
}
@@ -133,7 +133,7 @@ export default {
},
handleDelete(ids) {
this.$confirm("是否要进行删除?").then(() => {
this.instance.post("/app/appclapeventinfo/delete", null, {
this.instance.post("/app/appresidentreportinfo/delete", null, {
params: {ids}
}).then(res => {
if (res?.code == 0) {

6
project/wuxi/app/AppReportAiWill/components/Setting.vue
View File

@@ -107,7 +107,7 @@
methods: {
getList() {
this.instance.post(`/app/appclapeventgroup/list`, null, {
this.instance.post(`/app/appresidentreportgroup/list`, null, {
params: {
...this.search
}
@@ -138,7 +138,7 @@
onConfirm () {
this.$refs.form.validate((valid) => {
if (valid) {
this.instance.post(`/app/appclapeventgroup/addOrUpdate`, {
this.instance.post(`/app/appresidentreportgroup/addOrUpdate`, {
...this.form,
id: this.id || null
}).then(res => {
@@ -162,7 +162,7 @@
remove(id) {
this.$confirm('确定删除该数据？').then(() => {
this.instance.post(`/app/appclapeventgroup/delete?ids=${id}`).then(res => {
this.instance.post(`/app/appresidentreportgroup/delete?ids=${id}`).then(res => {
if (res.code == 0) {
this.$message.success('删除成功！')
this.getList()