Browse Source

城市管理

feature
tianq 3 years ago
parent
commit
e148a3390e
  1. 32
      src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue
  2. 89
      src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue
  3. 433
      src/views/modules/shequzhili/tuceng/chengshiguanli/record.vue
  4. 9
      src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue

32
src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue

@ -4,8 +4,8 @@
<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'120px'" v-if="pageType != 'view'">
<el-row>
<el-col :span="8">
<el-form-item label="场所名称" prop="placeOrgName">
<el-input v-model="formData.placeOrgName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
<el-form-item label="场所名称" prop="name">
<el-input v-model="formData.name" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="所属组织" prop="gridId">
<el-select v-model="formData.gridId" class="u-item-width-normal" :disabled="disabled" placeholder="全部" size="small" clearable>
@ -13,8 +13,8 @@
</el-select>
</el-form-item>
<el-form-item label="场所类型" prop="placeType">
<el-select class="u-item-width-normal" :disabled="disabled" v-model="formData.placeType" placeholder="全部" size="small" clearable>
<el-form-item label="场所类型" prop="category">
<el-select class="u-item-width-normal" :disabled="disabled" v-model="formData.category" placeholder="全部" size="small" clearable>
<el-option v-for="item in placeTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
@ -68,7 +68,7 @@
<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm" v-if="pageType != 'view'"> </el-button>
</div>
<div style="margin-top: 30px;"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
</el-card>
</template>
@ -79,7 +79,7 @@ import { Loading } from 'element-ui'; // 引入Loading服务
import { requestPost, requestGet } from '@/js/dai/request';
import daiMap from '@/utils/dai-map';
import nextTick from 'dai-js/tools/nextTick';
import record from './record';
let loading; //
let map;
var search;
@ -154,9 +154,9 @@ export default {
remark: ''
},
dataRule: {
placeOrgName: [{ required: true, message: '场所名称不能为空', trigger: 'bulr' }],
name: [{ required: true, message: '场所名称不能为空', trigger: 'bulr' }],
// placeCategory: [{ required: true, message: '', trigger: 'bulr' }],
placeType: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }],
category: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }],
// result: [{ required: true, message: '', trigger: 'bulr' }],
// scaleTotal: [{ required: true, validator: checkNum, trigger: 'bulr' }],
gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }],
@ -173,7 +173,7 @@ export default {
};
},
watch: {},
components: { record },
components: { },
created() {},
async mounted() {
console.log('detailId', this.detailId);
@ -220,7 +220,7 @@ export default {
}
},
async getDetail() {
const url = `/actual/base/enterprise/detail/${this.detailId}`;
const url = `/actual/base/cityManagement/detail/${this.detailId}`;
const { data, code, msg } = await requestPost(url);
if (code === 0) {
console.log('详情数据', data);
@ -230,16 +230,7 @@ export default {
this.$message.error(msg);
}
},
async getList() {
const url = `/actual/base/enterprise/patrollist/${this.detailId}`;
let params = {};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.list = data;
} else {
this.$message.error(msg);
}
},
handleComfirm() {
this.save();
},
@ -271,6 +262,7 @@ export default {
async save() {
console.log('this.formData', this.formData);
// this.formData.agencyId=this.agencyId;
var url = '';
var params = {};
if (this.pageType == 'add') {

89
src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue

@ -9,24 +9,20 @@
<el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="场所名称" prop="placeOrgName">
<el-input v-model="formData.placeOrgName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
<el-form-item label="场所名称" prop="name">
<el-input v-model="formData.name" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="场所类型" prop="placeType">
<el-select class="u-item-width-normal" v-model="formData.placeType" placeholder="全部" size="small" clearable>
<el-option v-for="item in placeTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
<el-form-item label="场所类型" prop="category">
<el-select class="u-item-width-normal" v-model="formData.category" placeholder="全部" size="small" clearable>
<el-option v-for="item in categoryNameList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="场所地址" prop="address">
<el-input v-model="formData.address" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
</el-form-item>
<el-row>
<el-col :span="24" align="right">
<el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearch">查询</el-button>
@ -64,28 +60,34 @@
<el-table :data="tableData" border class="m-table-item" style="width: 100%" @selection-change="handleSelectionChange" :height="maxTableHeight">
<el-table-column label="" fixed="left" type="selection" align="center" width="50" />
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
<el-table-column prop="placeOrgName" align="center" label="场所名称" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="gridName" align="center" label="所属组织" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="name" align="center" label="场所名称" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="categoryName" label="场所类型" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="address" label="场所地址" min-width="140" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="placeTypeName" label="场所类型" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="scaleTotal" align="center" width="80" label="场所规模"></el-table-column>
<el-table-column prop="placeCategoryName" align="center" width="80" label="场所类别"></el-table-column>
<el-table-column prop="personInCharge" align="center" width="110" label="负责人" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="mobile" align="center" :show-overflow-tooltip="true" label="联系电话"></el-table-column>
<el-table-column prop="latestPatrolTime" align="center" width="100" label="最新检查时间" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="latestResultName" align="center" label="最新巡查结果" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.latestResult === '0'">合格</span>
<span v-else-if="scope.row.latestResult === '1'">不合格</span>
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="200">
<template slot-scope="scope">
<el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
<el-button v-if="scope.row.latitude&&agencyId==scope.row.agencyId" style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text">编辑</el-button>
<el-button v-if="!scope.row.latitude&&agencyId==scope.row.agencyId" style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text">待完善</el-button>
<el-button @click="handleDel(scope.row)" v-if="agencyId==scope.row.agencyId" type="text" size="small" class="">删除</el-button>
<el-button
v-if="scope.row.latitude && agencyId == scope.row.agencyId"
style="margin-right: 10px"
@click="handleAdd(scope.row, 'edit')"
size="small"
type="text"
>
编辑
</el-button>
<el-button
v-if="!scope.row.latitude && agencyId == scope.row.agencyId"
style="margin-right: 10px"
@click="handleAdd(scope.row, 'edit')"
size="small"
type="text"
>
待完善
</el-button>
<el-button @click="handleDel(scope.row)" v-if="agencyId == scope.row.agencyId" type="text" size="small" class="">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -131,17 +133,14 @@ export default {
user: '',
agencyId: '',
formData: {
placeOrgName: '',
name: '',
gridId: '',
placeType: '',
address: '',
category: '',
address: ''
},
pageType: 'list', // list add dispose info
gridList: [], //list--
placeTypeList: [], //
categoryNameList: [], //
tableData: [],
resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
@ -169,7 +168,7 @@ export default {
this.user = this.$store.state.user;
this.agencyId = this.user.agencyId;
this.loadGrid();
this.loadplaceType();
this.loadcategoryName();
this.getTableData();
},
methods: {
@ -199,7 +198,7 @@ export default {
},
//
async loadplaceType() {
async loadcategoryName() {
const url = '/sys/dict/data/dictlist';
let params = {
@ -207,7 +206,7 @@ export default {
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.placeTypeList = data;
this.categoryNameList = data;
} else {
this.$message.error(msg);
}
@ -247,8 +246,8 @@ export default {
});
},
handleAdd(row, type) {
if (row.enterpriseId) {
this.detailId = row.enterpriseId;
if (row.id) {
this.detailId = row.id;
}
this.pageType = type;
if (type == 'view') {
@ -280,7 +279,7 @@ export default {
type: 'warning'
})
.then(() => {
this.del(rowData.enterpriseId);
this.del(rowData.id);
})
.catch(err => {});
},
@ -326,12 +325,10 @@ export default {
},
resetSearch() {
this.formData = {
placeOrgName: '',
name: '',
gridId: '',
placeType: '',
address: '',
category: '',
address: ''
};
this.pageNo = 1;
this.getTableData();

433
src/views/modules/shequzhili/tuceng/chengshiguanli/record.vue

@ -1,433 +0,0 @@
<template>
<div class="m-record">
<h3>检查记录</h3>
<div>
<div class="u-table-btn1 mt10" v-if="formType == 'edit'">
<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
</div>
<div class="m-table-item">
<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
<el-table-column prop="inspectTime" label="检查时间" align="center" width="200px">
<template slot-scope="scope">
<el-date-picker
v-if="scope.row.isEdit"
v-model="scope.row.inspectTime"
type="date"
class="input-width"
value-format="yyyy-MM-dd"
placeholder="选择日期"
></el-date-picker>
<div v-else class="div-content">{{ scope.row.inspectTime }}</div>
</template>
</el-table-column>
<el-table-column prop="inspectStaffId" label="检查人员" align="center" width="200px">
<template slot-scope="scope">
<el-select
v-if="scope.row.isEdit"
v-model="scope.row.inspectStaffId"
placeholder="请选择"
class="input-width"
@change="handleChangeStaff(scope.row)"
clearable
>
<el-option v-for="subItem in optionStaff" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
</el-select>
<div v-else class="div-content">{{ scope.row.inspectStaffName }}</div>
</template>
</el-table-column>
<el-table-column prop="inspectStaffMobile" label="联系电话" align="center" width="200px">
<template slot-scope="scope">
<el-input
v-if="scope.row.isEdit"
type="number"
v-model="scope.row.inspectStaffMobile"
placeholder="请输入"
class="input-width"
clearable
disabled
></el-input>
<div v-else class="div-content">{{ scope.row.inspectStaffMobile }}</div>
</template>
</el-table-column>
<el-table-column prop="inspectResult" label="检查结果" align="center" width="200px">
<template slot-scope="scope">
<el-select v-if="scope.row.isEdit" v-model="scope.row.inspectResult" placeholder="请选择" class="input-width" size="small" clearable>
<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
</el-select>
<div v-else class="div-content">{{ scope.row.inspectResult == 1 ? '正常' : '异常' }}</div>
</template>
</el-table-column>
<!-- <el-table-column
prop="detailed"
label="隐患明细"
align="center"
width="200px"
>
<template slot-scope="scope">
<el-input
v-if="scope.row.isEdit"
type="text"
v-model="scope.row.detailed"
placeholder="请输入"
class="input-width"
maxlength="500"
clearable
></el-input>
<div v-else class="div-content">
{{ scope.row.detailed }}
</div>
</template>
</el-table-column> -->
<el-table-column prop="imgList" label="图片列表" align="center" width="150px">
<template slot-scope="scope">
<div v-if="scope.row.isEdit">
<el-upload
:headers="$getElUploadHeaders()"
class="avatar-uploader"
:action="uploadUrl"
:data="{ customerId: customerId }"
:show-file-list="true"
:limit="3"
:file-list="scope.row.imgShowList"
:on-success="res => handleImgSuccess(res, scope.row)"
:on-remove="res => handleImgRemove(res, scope.row)"
list-type="picture"
:before-upload="beforeImgUpload"
>
<i class="el-icon-plus avatar-uploader-icon"></i>
最多三张图片
</el-upload>
</div>
<div v-else class="div-content">
<el-image
v-if="scope.row.imgList.length > 0"
style="width: 100px; height: 50px"
:src="scope.row.imgList[0]"
fit="cover"
:preview-src-list="scope.row.imgList"
></el-image>
</div>
</template>
</el-table-column>
<el-table-column prop="nextInspectTime" label="拟复查时间" align="center" width="200px">
<template slot-scope="scope">
<el-date-picker
v-if="scope.row.isEdit"
v-model="scope.row.nextInspectTime"
type="date"
class="input-width"
value-format="yyyy-MM-dd"
placeholder="选择日期"
></el-date-picker>
<div v-else class="div-content">{{ scope.row.nextInspectTime }}</div>
</template>
</el-table-column>
<el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
<template slot-scope="scope">
<template v-if="scope.row.isEdit">
<el-button @click="handleEdit(scope.row)" type="text" size="small" class="btn-color-edit">保存</el-button>
<el-button @click="handleChange(scope.row, 'cancle')" type="text" size="small" class="btn-color-edit">取消</el-button>
</template>
<template v-else>
<el-button v-if="formType == 'edit'" @click="handleChange(scope.row, 'edit')" type="text" size="small" :disabled="disabled" class="btn-color-edit">
修改
</el-button>
<el-popconfirm v-if="formType == 'edit'" title="删除之后无法恢复,确认删除?" @onConfirm="del(scope.row)" @confirm="del(scope.row)">
<el-button slot="reference" type="text" size="small" class="btn-color-del" style="margin-left: 10px">删除</el-button>
</el-popconfirm>
</template>
</template>
</el-table-column>
</el-table>
</div>
</div>
</div>
</template>
<script>
import { requestPost, requestGet } from '@/js/dai/request';
export default {
props: {
id: {
type: String,
default: ''
},
info: {
type: Object,
default: () => ({})
},
disabled: {
type: Boolean,
default: false
},
formType: {
type: String,
default: ''
},
source: {
//manage visiual
type: String,
default: 'manage'
}
},
data() {
return {
uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
customerId: localStorage.getItem('customerId'),
btnDisabled: false,
btnType: 'cancle',
isEdit: false,
tableData: [],
tempRow: {},
optionResult: [
{
label: '异常',
value: '0'
},
{
label: '正常',
value: '1'
}
],
optionStaff: [
// {
// label: "",
// value: "inspectStaffId",
// },
]
};
},
computed: {
allowOperate() {
const {
info: { agencyId }
} = this;
return agencyId && agencyId == this.$store.state.user.agencyId;
}
},
watch: {
id: {
handler(val) {
console.log('val------points', val);
if (val.length > 0) {
this.btnDisabled = false;
this.getList();
} else this.btnDisabled = true;
},
immediate: true
}
},
created() {
console.log('id', this.id);
this.getOptionStaff();
this.getList();
},
methods: {
beforeImgUpload(file) {
console.log(file);
const isLt1M = file.size / 1024 / 1024 < 10;
const srcType = file.type;
const format = file.name.split('.').pop();
if (!isLt1M) {
this.$message.error('上传文件大小不能超过 10MB!');
return false;
}
if (srcType.indexOf('image') == -1) {
this.$message.error('仅限图片格式');
return false;
}
return true;
},
handleImgSuccess(res, row) {
console.log('handleImgSuccess', res);
if (res.code === 0 && res.msg === 'success') {
row.imgList.push(res.data.url);
this.computeImgShowList(row);
} else {
this.$message.error(res.msg);
}
},
computeImgShowList(row) {
row.imgShowList = row.imgList.map(url => {
return { name: '', url };
});
},
handleImgRemove(file, row) {
console.log('handleImgRemove', file);
let url = file.url || file.response.data.url;
if (url) {
row.imgList = row.imgList.filter(item => item !== url);
this.computeImgShowList(row);
}
},
getRowClass({ rowIndex, columnIndex }) {
if (rowIndex === 0) {
return 'background: #2195fe; color: #fff;';
}
},
handleChange(row, type) {
console.log('type----', type);
if (type == 'cancle') {
row = { ...this.tempRow };
row.isEdit = false;
if (this.btnType == 'add') this.tableData.pop();
this.getList();
console.log('row----', row);
} else {
this.tempRow = { ...row };
row.isEdit = true;
}
this.btnType = type;
this.isEdit = !this.isEdit;
},
handleChangeStaff(row) {
const { inspectStaffId } = row;
const { optionStaff } = this;
let item = optionStaff.find(item => item.value == inspectStaffId);
if (item) {
row.inspectStaffName = item.name;
row.inspectStaffMobile = item.mobile;
}
},
async getOptionStaff() {
let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
const { data, code, msg } = await requestPost(url, {});
if (code === 0) {
this.optionStaff = data || [];
} else {
this.$message.error('请求工作人员数据失败!');
}
},
async handleEdit(row) {
if (this.btnType == 'add') this.save(row);
else this.edit(row);
},
handleAdd() {
this.btnType = 'add';
this.isEdit = true;
const item = {
isEdit: true,
id: this.id,
inspectTime: '',
inspectStaffId: '',
inspectStaffName: '',
inspectStaffMobile: '',
inspectResult: '',
imgList: [],
nextInspectTime: ''
};
this.computeImgShowList(item);
this.tableData.push(item);
},
async save(row) {
const params = {
enterpriseId: this.id,
...row
};
const url = `/actual/base/enterprise/addorupdate-patrol`;
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.$message.success('保存成功');
row.isEdit = false;
this.isEdit = false;
this.btnType = 'cancle';
this.getList();
} else {
this.$message.error(msg);
}
},
async edit(row) {
const params = {
...row
};
const url = `/actual/base/enterprise/addorupdate-patrol`;
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.$message.success('保存成功');
row.isEdit = false;
this.isEdit = false;
this.getList();
} else {
this.$message.error(msg);
}
},
async del(row) {
const url = `/actual/base/enterprise/del-patrol/${this.id}`;
const { data, code, msg } = await requestPost(url);
if (code === 0) {
this.$message.success('删除成功');
this.getList();
} else {
this.$message.error(msg);
}
},
async getList() {
const url = `/actual/base/enterprise/patrollist/`;
console.log('this.id', this.id);
const params = {
enterpriseId: this.id,
pageNo: 1,
pageSize: 10000
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.tableData = data.list.map(item => {
this.computeImgShowList(item);
return {
...item,
isEdit: false
};
});
} else {
this.$message.error(msg);
}
}
}
};
</script>
<style lang="scss" scoped>
@import '@/assets/scss/buttonstyle.scss';
@import '@/assets/scss/modules/management/list-main.scss';
.mt10 {
margin-bottom: 10px;
}
.input-width {
width: 170px;
}
</style>

9
src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue

@ -60,14 +60,7 @@
<el-table-column prop="location" label="所处位置" min-width="140" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="principalName" align="center" width="110" label="负责人" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="contactNum" align="center" :show-overflow-tooltip="true" label="联系电话"></el-table-column>
<el-table-column prop="latestInspectTime" align="center" width="100" label="最新检查时间" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="latestInspectResult" align="center" label="最新巡查结果" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.latestResult === '0'">合格</span>
<span v-else-if="scope.row.latestResult === '1'">不合格</span>
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="200">
<template slot-scope="scope">
<el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>

Loading…
Cancel
Save