Browse Source

Merge branch 'dev' into preview

feature
mk 3 years ago
parent
commit
84a61c6688
  1. 2
      src/views/dataBoard/renfang/cpts/rkfx.vue
  2. 22
      src/views/dataBoard/renfang/warn/building.vue
  3. 59
      src/views/dataBoard/renfang/warn/resi.vue
  4. 2
      src/views/modules/base/community/roomDetail.vue
  5. 2
      src/views/modules/base/community/roomForm.vue
  6. 35
      src/views/modules/base/community/roomTable.vue
  7. 1
      src/views/modules/cpts/base2/index.vue
  8. 28
      src/views/modules/shequzhili/tuceng/zhonghe/shebei/cpts/record.vue

2
src/views/dataBoard/renfang/cpts/rkfx.vue

@ -105,7 +105,7 @@
const {
type,
name
} = item;
} = item.data;
this.$router.push({
path: "/dataBoard/renfang/resi-analyze",
query: {

22
src/views/dataBoard/renfang/warn/building.vue

@ -30,7 +30,7 @@
></cpt-tb>
</div>
<resi-list :building_id="displayedId" :resident_type="type_id" v-if="displayedId" />
<!-- <resi-list :building_id="displayedId" :resident_type="type_id" /> -->
</div>
</template>
@ -153,13 +153,19 @@ export default {
showInfo(index) {
let item = this.srcTableData[index];
this.displayedId = item.building_id;
this.breadList.push({
meta: {
title: "预警人员列表",
},
});
// this.displayedId = item.building_id;
this.$router.push({
path:"/dataBoard/renfang/warn-resi",
query:{
building_id:item.building_id,
resident_type:this.type_id
}
})
// this.breadList.push({
// meta: {
// title: "",
// },
// });
},
handlePageNoChange(pageNo) {

59
src/views/dataBoard/renfang/warn/resi.vue

@ -1,5 +1,10 @@
<template>
<div class="g-pgi">
<cpt-bread
:separator="'/'"
@tap="handleClickBreadItem"
:breadList="breadList"
></cpt-bread>
<div class="m-title">
<img
class="title_img"
@ -40,14 +45,14 @@ export default {
name: "resi-list",
props: {
building_id: {
type: String,
default: "",
},
resident_type: {
type: String,
default: "",
},
// building_id: {
// type: String,
// default: "",
// },
// resident_type: {
// type: String,
// default: "",
// },
},
components: {
@ -124,14 +129,38 @@ export default {
],
displayedResiId: "",
breadList: [
{
type: "back",
meta: {
title: "人房总览",
},
},
{
type: "building",
meta: {
title: "预警楼栋列表",
},
},
{
type: "resi",
meta: {
title: "预警人员列表",
},
},
],
};
},
mounted() {
activated() {
this.building_id = getQueryPara("building_id");
this.resident_type = getQueryPara('resident_type')
this.pageNo = 1;
this.getList();
this.getCount();
},
methods: {
showInfo(index) {
let item = this.srcTableData[index];
@ -223,6 +252,16 @@ export default {
this.$message.error(msg);
}
},
handleClickBreadItem({ item }) {
if (item.type == "back") {
this.$router.push({
path:"/dataBoard/renfang/index"
})
} else if (item.type == "building") {
this.displayedId = "";
this.$router.back();
}
},
},
destroyed() {

2
src/views/modules/base/community/roomDetail.vue

@ -273,7 +273,7 @@ export default {
view_real_data: {
//
type: Boolean,
default: false,
default: true,
},
},
};

2
src/views/modules/base/community/roomForm.vue

@ -466,7 +466,7 @@ export default {
props: {
view_real_data: {//
type: Boolean,
default: false,
default: true,
}
}
}

35
src/views/modules/base/community/roomTable.vue

@ -2,8 +2,9 @@
<div class="m-table">
<div class="u-table-btn2">
<div class="u-table-btn2-left">
<!-- v-show="btnAuths.ic_house_add" -->
<el-button v-if="agencyObj.level === 'building' || source !== 'search'"
v-show="btnAuths.ic_house_add"
class="diy-button--blue"
icon="el-icon-plus"
size="small"
@ -18,9 +19,9 @@
trigger="hover">
<div class="table-more-btn">
<!-- v-if="btnAuths.ic_house_import" -->
<el-upload ref="upload"
v-if="btnAuths.ic_house_import"
:multiple="false"
style="text-align: center"
:show-file-list="false"
@ -44,14 +45,15 @@
</el-popover>
</div>
<!-- v-if="btnAuths.ic_house_export" -->
<el-button style="float: left; margin-left: 10px"
v-if="btnAuths.ic_house_export"
class="diy-button--white"
size="small"
@click="handleExport">导出</el-button>
<!-- v-if="btnAuths.ic_house_batch_del" -->
<el-button style="float: left; margin-left: 10px"
v-if="btnAuths.ic_house_batch_del"
class="diy-button--white"
size="small"
@click="deleteBatch">批量删除</el-button>
@ -67,14 +69,15 @@
<div v-if="showImportBtn"
class="table-more-btn">
<!-- v-if="btnAuths.ic_house_import" -->
<el-button :headers="$getElUploadHeaders()"
v-if="btnAuths.ic_house_import"
class="diy-button--other"
size="small"
type="text"
@click="handleExportModule">下载房屋模板</el-button>
</div>
<div v-if="btnAuths.ic_house_export_yhyd"
<!-- v-if="btnAuths.ic_house_export_yhyd" -->
<div
class="table-more-btn">
<el-button style=""
class="diy-button--other"
@ -84,8 +87,8 @@
@click="handleExportYihuyidang()">导出一户一档</el-button>
</div>
<div v-if="btnAuths.ic_house_smart_import && displayedBaobiaoBtn"
<!-- btnAuths.ic_house_smart_import && -->
<div v-if=" displayedBaobiaoBtn"
class="table-more-btn">
<el-button size="small"
class="diy-button--other"
@ -226,18 +229,19 @@
align="center"
class="operate">
<template slot-scope="scope">
<!-- v-if="btnAuths.ic_house_view" -->
<el-button type="text"
v-if="btnAuths.ic_house_view"
class="div-table-button--blue"
size="small"
@click="handleDetail(scope.row)">查看</el-button>
<el-button v-if="btnAuths.ic_house_update && scope.row.showBtn"
<!-- btnAuths.ic_house_update && -->
<el-button v-if=" scope.row.showBtn"
type="text"
class="div-table-button--blue"
size="small"
@click="handleEdit(scope.row)">编辑</el-button>
<el-button v-if="btnAuths.ic_house_del && scope.row.showBtn"
<!-- btnAuths.ic_house_del && -->
<el-button v-if=" scope.row.showBtn"
type="text"
class="div-table-button--blue"
size="small"
@ -267,7 +271,6 @@
class="dialog-h"
@closed="diaClose">
<room-form ref="ref_form"
:view_real_data="btnAuths.ic_house_view_real_data"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></room-form>
</el-dialog>
@ -281,8 +284,8 @@
top="5vh"
class="dialog-h"
@closed="detailFormCancle">
<!-- :view_real_data="btnAuths.ic_house_view_real_data" -->
<room-detail ref="ref_form_detail"
:view_real_data="btnAuths.ic_house_view_real_data"
@diaDetailClose="detailFormCancle"></room-detail>
</el-dialog>

1
src/views/modules/cpts/base2/index.vue

@ -796,6 +796,7 @@ export default {
this.formType = "add";
this.formTitle = "新增";
this.formShow = true;
this.formId = '';
},
handleWatch(row) {

28
src/views/modules/shequzhili/tuceng/zhonghe/shebei/cpts/record.vue

@ -1,6 +1,6 @@
<template>
<div class="m-record">
<h3>检查记录</h3>
<h3 class="title_box">检查记录</h3>
<div>
<div class="u-table-btn1 mt10" v-if="formType == 'edit'">
<el-button
@ -38,7 +38,7 @@
<template slot-scope="scope">
<el-form-item
:prop="'tableData.' + scope.$index + '.inspectTime'"
style="margin-bottom: 0px;"
style="margin-bottom: 0px"
>
<el-date-picker
v-if="scope.row.isEdit"
@ -66,7 +66,7 @@
<template slot-scope="scope">
<el-form-item
:prop="'tableData.' + scope.$index + '.inspectStaffId'"
style="margin-bottom: 0px;"
style="margin-bottom: 0px"
>
<el-select
v-if="scope.row.isEdit"
@ -123,7 +123,7 @@
<template slot-scope="scope">
<el-form-item
:prop="'tableData.' + scope.$index + '.inspectResult'"
style="margin-bottom: 0px;"
style="margin-bottom: 0px"
>
<el-select
v-if="scope.row.isEdit"
@ -180,7 +180,7 @@
<div v-if="scope.row.isEdit">
<el-form-item
:prop="'tableData.' + scope.$index + '.imgList'"
style="margin-bottom: 0px;"
style="margin-bottom: 0px"
>
<el-upload
:headers="$getElUploadHeaders()"
@ -222,7 +222,7 @@
<template slot-scope="scope">
<el-form-item
:prop="'tableData.' + scope.$index + '.nextInspectTime'"
style="margin-bottom: 0px;"
style="margin-bottom: 0px"
>
<el-date-picker
v-if="scope.row.isEdit"
@ -241,7 +241,7 @@
</el-table-column>
<el-table-column
v-if="!disabled ||formType == 'edit'||formType == 'add'"
v-if="!disabled || formType == 'edit' || formType == 'add'"
fixed="right"
label="操作"
align="center"
@ -685,4 +685,18 @@ export default {
.input-width {
width: 170px;
}
.title_box {
position: relative;
&::after {
display: inline-block;
width: 3px;
height: 16px;
background-color: #0056d6;
// margin-left: -5px;
content: "";
position: absolute;
top: 0;
left: -5px;
}
}
</style>

Loading…
Cancel
Save