Browse Source

Merge branch 'preview' of http://git.elinkit.com.cn:7070/r/epmet-work-pc into preview

feature
wxz 2 years ago
parent
commit
ed6ba3d6a3
  1. 5
      src/views/dataBoard/cpts/tb.vue
  2. 2
      src/views/dataBoard/renfang/cpts/rkfx.vue
  3. 2
      src/views/dataBoard/renfang/house/list.vue
  4. 22
      src/views/dataBoard/renfang/warn/building.vue
  5. 59
      src/views/dataBoard/renfang/warn/resi.vue
  6. 2
      src/views/dataBoard/sida/zy/placeResList.vue
  7. 8
      src/views/modules/base/community/communityTable.vue
  8. 2
      src/views/modules/base/community/roomDetail.vue
  9. 2
      src/views/modules/base/community/roomForm.vue
  10. 35
      src/views/modules/base/community/roomTable.vue
  11. 21
      src/views/modules/communityService/policy/addPolicy.vue
  12. 46
      src/views/modules/communityService/policy/policyList.vue
  13. 1447
      src/views/modules/cpts/base2/cpts/edit.vue
  14. 4
      src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
  15. 10
      src/views/modules/shequzhili/tuceng/zhonghe/shebei/cpts/record.vue

5
src/views/dataBoard/cpts/tb.vue

@ -231,7 +231,9 @@ export default {
mounted() {},
created() {},
activated(){
this.pageNo = 1
},
methods: {
//
handleClickRow(index) {
@ -247,6 +249,7 @@ export default {
},
handlePageNoChange(val) {
this.pageNo = val
this.$emit("handlePageNoChange", val);
},
handleSizeChange(val) {

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: {

2
src/views/dataBoard/renfang/house/list.vue

@ -164,7 +164,7 @@ export default {
},
methods: {
handleRouter(){
document.getElementById('scT').getElementsByClassName('g-bd')[0].scrollTop = 0
document.getElementById('g-scT').getElementsByClassName('g-bd')[0].scrollTop = 0
},
handleClickBreadItem({ item }) {
if (item.type == "back") {

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/dataBoard/sida/zy/placeResList.vue

@ -254,7 +254,7 @@ export default {
width: '10%'
}
]),
(this.header = ['序号', '场所名称', '场所类型', '场所规模', '负责人', '手机号', '最新检查时间', '最新检查结果', '故障次数', '操作']);
(this.header = ['序号', '场所名称', '场所类型', '场所规模', '负责人', '联系电话', '最新检查时间', '最新检查结果', '故障次数', '操作']);
this.list = data.map((item, index) => {
return [
index + 1,

8
src/views/modules/base/community/communityTable.vue

@ -504,7 +504,7 @@ export default {
xcxmLoading: false,
agencyObj: {}, //
treeObj:{},
tableData: [],
validTableDataNum: 0, //
selection: [],
@ -636,7 +636,7 @@ export default {
});
},
async loadTable(fromTree, treeObj) {
console.log(111, treeObj);
this.treeObj = {... treeObj}
//
this.roleList = localStorage.getItem("roleList");
let conditions = [];
@ -1337,11 +1337,11 @@ export default {
handleSizeChange(val) {
this.pageSize = val;
this.pageNo = 1;
this.loadTable();
this.loadTable(this.treeObj);
},
handleCurrentChange(val) {
this.pageNo = val;
this.loadTable();
this.loadTable(this.treeObj);
},
//

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>

21
src/views/modules/communityService/policy/addPolicy.vue

@ -242,6 +242,7 @@
:disabled="formType === 'detail'"
:rules="newDataRule"
ref="ref_policy_form1"
v-if="newFormData"
>
<el-form-item
v-if="formData.assignFlag"
@ -578,6 +579,15 @@ export default {
data.assignInfo.serviceScopeList[i].objectId
);
}
} else {
this.newFormData = {
noticeApproches: [],
serviceScopeList: [], //
serviceTimeStart: "", //yyyy-MM-dd
serviceTimeEnd: "", //yyyy-MM-dd
serverOrgType: "", // community_org ic_user_volunteer party_unit
serverOrgId: "", //Id
};
}
if (data.attachmentList) {
this.fileList = data.attachmentList;
@ -644,7 +654,7 @@ export default {
const url = "/actual/base/serviceitem/listServerOrg";
let params = {
serviceTypeId: this.formData.policyCategoryL2,
serverOrgType: this.formData.assignInfo.serverOrgType,
serverOrgType: this.newFormData.serverOrgType ||this.formData.assignInfo.serverOrgType,
businessType: "common_service",
};
console.log(this.formData);
@ -750,7 +760,6 @@ export default {
// // this.formData.ruleList = this.ruleList
// // return false
// this.btnDisable = true;
// setTimeout(() => {
// this.btnDisable = false;
@ -763,7 +772,7 @@ export default {
// this.addFuwu();
// }
// });
this.addFuwu();
await this.addFuwu();
},
getLastItem(list, vals, key) {
let LIST = list || [];
@ -771,7 +780,6 @@ export default {
// console.log(item[key]);
for (let i of vals) {
if (item[key] === i) {
console.log(item[key]);
this.sarr.push(item);
} else if (item["objectType"] == "district") {
this.getLastItem(item.children, vals, key);
@ -814,6 +822,7 @@ export default {
async addFuwu() {
//
await this.operationOption();
// ,
// this.formData.attachmentList = [...this.fileList];
// this.fileList.forEach(item=>{
// this.formData.attachmentList.push({
@ -835,7 +844,7 @@ export default {
this.formData.policyId = this.policyId;
}
//nullnull?
if (this.formType == "copy"&& this.formData.assignFlag == 0) {
if (this.formType == "copy" && this.formData.assignFlag == 0) {
this.formData.assignInfo = {
noticeApproches: [],
serverOrgId: "",
@ -844,7 +853,7 @@ export default {
serviceTimeEnd: "",
serviceTimeStart: "",
};
this.formData.attachmentList = []
this.formData.attachmentList = [];
}
// const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
let params = {

46
src/views/modules/communityService/policy/policyList.vue

@ -35,8 +35,9 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="人员标签" prop="expiredFlag">
<el-form-item label="人员标签" prop="resiSearchTagName">
<el-input
v-model="formData.resiSearchTagName"
placeholder="请输入"
size="small"
class="u-item-width-normal"
@ -59,25 +60,25 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="发布日期" prop="timeStart">
<el-form-item label="发布日期" prop="createdTimeStart">
<el-date-picker
v-model="formData.timeStart"
v-model="formData.createdTimeStart"
class="u-item-width-daterange"
size="small"
type="date"
value-format="yyyy-MM-dd"
value="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
value="yyyy-MM-dd HH:mm:ss"
placeholder="开始时间"
>
</el-date-picker>
<span class="u-data-tag"></span>
<el-date-picker
v-model="formData.timeEnd"
v-model="formData.createdTimeEnd"
class="u-item-width-daterange u-data-tag"
size="small"
type="date"
value-format="yyyy-MM-dd"
value="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
value="yyyy-MM-dd HH:mm:ss"
placeholder="结束时间"
>
</el-date-picker>
@ -185,7 +186,7 @@
>
<template slot-scope="scope">
<span>{{
scope.row.expiredFlag === "1" ? "已过期" : "未过期"
scope.row.expiredFlag ? "已过期" : "未过期"
}}</span>
</template>
</el-table-column>
@ -287,27 +288,31 @@ export default {
user: {},
agencyId: "",
policyLevelArray: [
{ value: "0", label: "市级" },
{ value: "1", label: "区级" },
{ value: "2", label: "街道级" },
{ value: 0, label: "市级" },
{ value: 1, label: "区级" },
{ value: 2, label: "街道级" },
], //
tableData: [],
statusArray: [
{
value: "1",
value: true,
label: "是",
},
{
value: "0",
value: false,
label: "否",
},
],
formData: {
title: "", //
content: "", //
expiredFlag: "", //10
// content: "", //
expiredFlag: null, //10
policyLevel:null,//012
resiSearchTagName:"",//
createdTimeStart:"",//yyyy-MM-dd
createdTimeEnd:"",//yyyy-MM-dd
},
pageNo: 1,
pageSize: window.localStorage.getItem("pageSize") || 20,
@ -478,7 +483,7 @@ export default {
pageNo,
...formData,
});
console.log(this.formData);
this.tableLoading = false;
if (code === 0) {
this.total = data.total || 0;
@ -552,8 +557,11 @@ export default {
resetSearch() {
this.formData = {
title: "", //
content: "", //
expiredFlag: "", //10
expiredFlag: null, //10
policyLevel:null,//012
resiSearchTagName:"",//
createdTimeStart:"",//yyyy-MM-dd
createdTimeEnd:"",//yyyy-MM-dd
};
this.pageNo = 1;

1447
src/views/modules/cpts/base2/cpts/edit.vue

File diff suppressed because it is too large

4
src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue

@ -137,10 +137,10 @@ export default {
data() {
let checkMObile = (rule, value, callback) => {
if (value === '') {
callback(new Error('请输入手机号'));
callback(new Error('请输入联系电话'));
} else {
if (!isMobile(value)) {
callback(new Error('手机号格式不正确'));
callback(new Error('联系电话格式不正确'));
}
callback();
}

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

@ -241,7 +241,7 @@
</el-table-column>
<el-table-column
v-if="!disabled || formType == 'edit' || formType == 'add'"
v-if="formType == 'edit' || formType == 'add'"
fixed="right"
label="操作"
align="center"
@ -385,12 +385,12 @@ export default {
},
optionResult: [
{
label: "合格",
value: "0",
label: "正常",
value: "1",
},
{
label: "不合格",
value: "1",
label: "异常",
value: "0",
},
],
optionStaff: [

Loading…
Cancel
Save