Browse Source

Merge branch 'master' into yantai_master

dev-烟台0301
dai 3 years ago
parent
commit
6f6a93b142
  1. 6
      src/views/modules/base/community/buildForm.vue
  2. 6
      src/views/modules/base/community/communityForm.vue
  3. 716
      src/views/modules/communityParty/heart/heartForm.vue
  4. 8
      src/views/modules/communityParty/regionalParty/activitysForm.vue
  5. 8
      src/views/modules/communityParty/regionalParty/unitsForm.vue
  6. 8
      src/views/modules/communityService/dqfwzx/cpts/edit.vue
  7. 6
      src/views/modules/communityService/fuwujilu/addForm.vue
  8. 6
      src/views/modules/communityService/fuwujilu/editForm.vue
  9. 8
      src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
  10. 82
      src/views/modules/communityService/shzz/cpts/edit.vue
  11. 12
      src/views/modules/communityService/sqzzz/cpts/edit.vue
  12. 8
      src/views/modules/cpts/base/cpts/edit.vue
  13. 612
      src/views/modules/partymember/icpartyorg-add-or-update.vue
  14. 6
      src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
  15. 6
      src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
  16. 308
      src/views/modules/renFangTongJi/index.vue
  17. 8
      src/views/modules/shequzhili/csgltc/csglForm.vue
  18. 8
      src/views/modules/shequzhili/event/cpts/add.vue
  19. 8
      src/views/modules/shequzhili/ggfwtc/ggfwForm.vue

6
src/views/modules/base/community/buildForm.vue

@ -372,9 +372,11 @@ export default {
markers.setGeometries([])
//
search
.searchRectangle({
.searchNearby({
keyword: this.keyWords,
bounds: map.getBounds()
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result

6
src/views/modules/base/community/communityForm.vue

@ -285,9 +285,11 @@ export default {
markers.setGeometries([])
//
search
.searchRectangle({
.searchNearby({
keyword: this.keyWords,
bounds: map.getBounds()
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result

716
src/views/modules/communityParty/heart/heartForm.vue

File diff suppressed because it is too large

8
src/views/modules/communityParty/regionalParty/activitysForm.vue

@ -425,7 +425,7 @@ export default {
// map TMap.Map()
map = new window.TMap.Map(document.getElementById('app'), {
center: center, //
zoom: 17.2, //
zoom: 16.2, //
pitch: 43.5, //
rotation: 45 //
})
@ -470,9 +470,11 @@ export default {
markers.setGeometries([])
//
search
.searchRectangle({
.searchNearby({
keyword: this.keyWords,
bounds: map.getBounds()
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result

8
src/views/modules/communityParty/regionalParty/unitsForm.vue

@ -354,7 +354,7 @@ export default {
// map TMap.Map()
map = new window.TMap.Map(document.getElementById('app'), {
center: center, //
zoom: 17.2, //
zoom: 16.2, //
pitch: 43.5, //
rotation: 45 //
})
@ -399,9 +399,11 @@ export default {
markers.setGeometries([])
//
search
.searchRectangle({
.searchNearby({
keyword: this.keyWords,
bounds: map.getBounds()
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result

8
src/views/modules/communityService/dqfwzx/cpts/edit.vue

@ -449,7 +449,7 @@ export default {
// map TMap.Map()
map = new window.TMap.Map(document.getElementById("app"), {
center: center, //
zoom: 17.2, //
zoom: 16.2, //
pitch: 43.5, //
rotation: 45, //
});
@ -493,9 +493,11 @@ export default {
markers.setGeometries([]);
//
search
.searchRectangle({
.searchNearby({
keyword: this.dataForm.locationAddress,
bounds: map.getBounds(),
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result;

6
src/views/modules/communityService/fuwujilu/addForm.vue

@ -1023,9 +1023,11 @@ export default {
markers.setGeometries([]);
//
search
.searchRectangle({
.searchNearby({
keyword: this.keyWords,
bounds: map.getBounds(),
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result;

6
src/views/modules/communityService/fuwujilu/editForm.vue

@ -608,9 +608,11 @@ export default {
markers.setGeometries([])
//
search
.searchRectangle({
.searchNearby({
keyword: this.keyWords,
bounds: map.getBounds()
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result

8
src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue

@ -279,7 +279,7 @@ export default {
// map TMap.Map()
map = new window.TMap.Map(document.getElementById("app"), {
center: center, //
zoom: 17.2, //
zoom: 16.2, //
pitch: 43.5, //
rotation: 45, //
});
@ -323,9 +323,11 @@ export default {
markers.setGeometries([]);
//
search
.searchRectangle({
.searchNearby({
keyword: this.fmData.address,
bounds: map.getBounds(),
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result;

82
src/views/modules/communityService/shzz/cpts/edit.vue

@ -9,20 +9,29 @@
:disabled="formType === 'detail'"
class="form"
>
<el-form-item label="头像" label-width="150px"
<el-form-item
label="头像"
label-width="150px"
prop="imageList"
style="display: block">
style="display: block"
>
<div class="imsg-list">
<div v-for="(item, index) in dataForm.imageList" :key="index" class="imgs-item">
<div
v-for="(item, index) in dataForm.imageList"
:key="index"
class="imgs-item"
>
<el-image
style="width: 100px; height: 100px"
:src="item"
fit="fill"
:preview-src-list="dataForm.imageList"></el-image>
:preview-src-list="dataForm.imageList"
></el-image>
<i class="el-icon-delete" @click="handleDelimg(item, index)"></i>
</div>
<el-upload :headers="$getElUploadHeaders()" class="avatar-uploader"
<el-upload
:headers="$getElUploadHeaders()"
class="avatar-uploader"
v-if="dataForm.imageList.length < 1 && !disabled"
:action="uploadUlr"
:data="{ customerId: customerId }"
@ -31,10 +40,15 @@
:on-progress="handleProgress"
:on-success="handleImgSuccess"
:before-upload="beforeImgUpload"
accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP">
<el-progress v-if="uploading" :width="100" type="circle" :percentage="unloadPencent"></el-progress>
accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"
>
<el-progress
v-if="uploading"
:width="100"
type="circle"
:percentage="unloadPencent"
></el-progress>
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</div>
</el-form-item>
@ -203,8 +217,7 @@
:disabled="btnDisable"
@click="handleComfirm"
>
</el-button
>
</el-button>
</div>
</div>
</template>
@ -223,11 +236,11 @@ let loading; // 加载动画
export default {
data() {
return {
uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
btnLoading: false,
uploading: false,
disabled: false,
customerId: '',
customerId: "",
formType: "add", // addeditdetail
agencyId: "",
@ -316,7 +329,7 @@ export default {
// map TMap.Map()
map = new window.TMap.Map(document.getElementById("app"), {
center: center, //
zoom: 17.2, //
zoom: 16.2, //
pitch: 43.5, //
rotation: 45, //
});
@ -358,9 +371,11 @@ export default {
markers.setGeometries([]);
//
search
.searchRectangle({
.searchNearby({
keyword: this.dataForm.address,
bounds: map.getBounds(),
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result;
@ -378,32 +393,32 @@ export default {
});
},
beforeImgUpload(file) {
const isPNG = (file.type === 'image/png') || (file.type === 'image/jpeg')
const isLt1M = file.size / 1024 / 1024 < 10
const isPNG = file.type === "image/png" || file.type === "image/jpeg";
const isLt1M = file.size / 1024 / 1024 < 10;
if (!isPNG) {
this.$message.error('上传图片只能是 PNG 或 JPEG 格式!')
this.$message.error("上传图片只能是 PNG 或 JPEG 格式!");
}
if (!isLt1M) {
this.$message.error('上传图片大小不能超过 10MB!')
this.$message.error("上传图片大小不能超过 10MB!");
}
return isPNG && isLt1M
return isPNG && isLt1M;
},
handleProgress(event, file, fileList) {
this.uploading = true
this.unloadPencent = Number(file.percentage.toFixed(0))
this.uploading = true;
this.unloadPencent = Number(file.percentage.toFixed(0));
},
handleImgSuccess(res, file) {
if (res.code === 0 && res.msg === 'success') {
this.uploading = false
this.unloadPencent = 0
this.dataForm.imageList.push(res.data.url)
if (res.code === 0 && res.msg === "success") {
this.uploading = false;
this.unloadPencent = 0;
this.dataForm.imageList.push(res.data.url);
} else {
this.$message.error(res.msg)
this.$message.error(res.msg);
}
},
handleDelimg(item, index) {
this.dataForm.imageList.splice(index, 1)
this.dataForm.imageList.splice(index, 1);
},
handleMoveCenter() {
//
@ -419,7 +434,7 @@ export default {
this.$refs.ref_form.resetFields();
this.formType = type;
this.dataForm.imageList = []
this.dataForm.imageList = [];
if (row) {
this.dataForm = { ...this.dataForm, ...row };
if (row.imgUrl) {
@ -485,7 +500,6 @@ export default {
},
async submit() {
let url = "";
if (this.formType === "add") {
url = "/heart/societyorg/add";
@ -535,7 +549,6 @@ export default {
latitude: "",
imageList:[]
};*/
},
//
startLoading() {
@ -597,15 +610,14 @@ export default {
}
.avatar-uploader {
::v-deep
.el-upload {
::v-deep .el-upload {
cursor: pointer;
position: relative;
overflow: hidden;
}
.el-upload:hover {
border-color: #409EFF;
border-color: #409eff;
}
.avatar {

12
src/views/modules/communityService/sqzzz/cpts/edit.vue

@ -314,9 +314,7 @@ export default {
principalPhone: [
{ required: true, message: "联系电话不能为空", trigger: "blur" },
],
address: [
{ required: true, message: "地址不能为空", trigger: "blur" },
],
address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
longitude: [
{ required: true, message: "请拖动地图选择坐标点", trigger: "blur" },
],
@ -404,7 +402,7 @@ export default {
// map TMap.Map()
map = new window.TMap.Map(document.getElementById("app"), {
center: center, //
zoom: 17.2, //
zoom: 16.2, //
pitch: 43.5, //
rotation: 45, //
});
@ -448,9 +446,11 @@ export default {
markers.setGeometries([]);
//
search
.searchRectangle({
.searchNearby({
keyword: this.dataForm.address,
bounds: map.getBounds(),
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result;

8
src/views/modules/cpts/base/cpts/edit.vue

@ -635,7 +635,7 @@ export default {
// map TMap.Map()
map = new window.TMap.Map(document.getElementById("app"), {
center: center, //
zoom: 13, //
zoom: 16.2, //
pitch: 43.5, //
rotation: 45, //
});
@ -679,9 +679,11 @@ export default {
markers.setGeometries([]);
//
search
.searchRectangle({
.searchNearby({
keyword: this.fmData[item.keyName],
bounds: map.getBounds(),
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result;

612
src/views/modules/partymember/icpartyorg-add-or-update.vue

@ -1,78 +1,130 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? '新增党组织' : '更新党组织'" :close-on-click-modal="false"
:close-on-press-escape="false">
<el-form class="form"
<el-dialog
:visible.sync="visible"
:title="!dataForm.id ? '新增党组织' : '更新党组织'"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form
class="form"
:model="dataForm"
:rules="dataRule"
ref="dataForm"
@keyup.enter.native="dataFormSubmitHandle()"
:label-width="$i18n.locale === 'en-US' ? '120px' : '100px'">
:label-width="$i18n.locale === 'en-US' ? '120px' : '100px'"
>
<el-form-item prop="partyOrgType" label="党组织类型">
<el-select :disabled="dataForm.id || dataForm.orgId ? true : false" v-model="dataForm.partyOrgType" @change="changePartyOrgType" clearable placeholder="请选择党组织类型">
<el-select
:disabled="dataForm.id || dataForm.orgId ? true : false"
v-model="dataForm.partyOrgType"
@change="changePartyOrgType"
clearable
placeholder="请选择党组织类型"
>
<el-option
v-for="item in partyOrgTypeList"
:key="item.value"
:label="item.name"
:value="item.value">
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="partyOrgName" label="党组织名称">
<el-input v-model="dataForm.partyOrgName" placeholder="请输入党组织名称" style="width:300px"></el-input>
<el-input
v-model="dataForm.partyOrgName"
placeholder="请输入党组织名称"
style="width: 300px"
></el-input>
</el-form-item>
<el-form-item label="党组织编码" prop="partyOrgCode">
<el-input v-model="dataForm.partyOrgCode" placeholder="党组织编码" style="width:300px"></el-input>
<el-input
v-model="dataForm.partyOrgCode"
placeholder="党组织编码"
style="width: 300px"
></el-input>
</el-form-item>
<el-form-item v-if="dataForm.partyOrgType != '5'" prop="agencyId" label="行政组织">
<el-form-item
v-if="dataForm.partyOrgType != '5'"
prop="agencyId"
label="行政组织"
>
<el-cascader
style="width: 300px"
v-model="dataForm.agencyId"
:options="agencyOrgList"
placeholder="请选择行政组织"
:props="{ emitPath:false, checkStrictly: true, label: 'name', value: 'id', children: 'children' }"
:props="{
emitPath: false,
checkStrictly: true,
label: 'name',
value: 'id',
children: 'children',
}"
:disabled="dataForm.id ? true : false"
:show-all-levels="false"
@change="changeAgencyOrg"
clearable />
clearable
/>
</el-form-item>
<el-form-item v-if="!dataForm.sjdzzName" prop="mySelectOrg" label="上级党组织">
<el-form-item
v-if="!dataForm.sjdzzName"
prop="mySelectOrg"
label="上级党组织"
>
<el-cascader
ref="myOrg"
style="width: 300px"
v-model="dataForm.mySelectOrg"
:options="orgList"
placeholder="请选择上级党组织"
:props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }"
:props="{
checkStrictly: true,
label: 'partyOrgName',
value: 'id',
children: 'children',
}"
@change="handleChangeOrg"
:disabled="dataForm.id || dataForm.orgId ? true : false"
clearable />
clearable
/>
</el-form-item>
<el-form-item v-if="dataForm.sjdzzName" label="上级党组织">
<el-input :disabled="true" v-model="dataForm.sjdzzName" style="width:300px"></el-input>
<el-input
:disabled="true"
v-model="dataForm.sjdzzName"
style="width: 300px"
></el-input>
</el-form-item>
<el-form-item label="党组织介绍" prop="introduction">
<el-input style="width:300px" v-model="dataForm.introduction" type="textarea" maxlength="500" placeholder="党组织介绍"></el-input>
<el-input
style="width: 300px"
v-model="dataForm.introduction"
type="textarea"
maxlength="500"
placeholder="党组织介绍"
></el-input>
</el-form-item>
<el-form-item label="党组织位置"
prop="longitude"
style="display: block">
<el-form-item label="党组织位置" prop="longitude" style="display: block">
<div class="item_width_1">
<div class="div_map">
<div id="app">
</div>
<div id="app"></div>
<div style="display: none" id="mapSeach_id" class="div_searchmap">
<el-input class="item_width_4"
<el-input
class="item_width_4"
maxlength="50"
size="mini"
placeholder="请输入关键字"
v-model="keyWords">
v-model="keyWords"
>
</el-input>
<el-button style="margin-left: 10px"
<el-button
style="margin-left: 10px"
type="primary"
size="mini"
@click="handleSearchMap">查询</el-button>
@click="handleSearchMap"
>查询</el-button
>
</div>
</div>
@ -96,84 +148,88 @@
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
<el-button @click="visible = false">{{ $t("cancel") }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{
$t("confirm")
}}</el-button>
</template>
</el-dialog>
</template>
<script>
var map
var search
var markers
var infoWindowList
var geocoder //
import debounce from 'lodash/debounce'
var map;
var search;
var markers;
var infoWindowList;
var geocoder; //
import debounce from "lodash/debounce";
export default {
data() {
return {
visible: false,
keyWords: '',
keyWords: "",
dataForm: {
id: '',
partyOrgType: '', // 0,1,2,3,4,5
partyOrgName: '', //
partyOrgCode: '', //
mySelectOrg:'', //
orgPid: '', // ID,0
orgPids: '', // ID,0
agencyId: '', // id
agencyPids:'', // ids()
longitude: '', //
latitude: '', //
address: '',
introduction: '', //
orgId: '',
customerId: '',
staffId:'',
orgPidName: '',
agencyName:'',
pid: '',
sjdzzName: '' //
id: "",
partyOrgType: "", // 0,1,2,3,4,5
partyOrgName: "", //
partyOrgCode: "", //
mySelectOrg: "", //
orgPid: "", // ID,0
orgPids: "", // ID,0
agencyId: "", // id
agencyPids: "", // ids()
longitude: "", //
latitude: "", //
address: "",
introduction: "", //
orgId: "",
customerId: "",
staffId: "",
orgPidName: "",
agencyName: "",
pid: "",
sjdzzName: "", //
},
orgListVisible: false,
agencyListVisible: false,
orgList: [],
agencyId: '',
level: '',
agencyId: "",
level: "",
partyOrgTypeList: [],
agencyOrgList:[]
}
agencyOrgList: [],
};
},
methods: {
init() {
this.visible = true
this.agencyId = localStorage.getItem('agencyId')
this.dataForm.customerId = localStorage.getItem('customerId')
this.dataForm.staffId = localStorage.getItem('staffId')
this.keyWords = ''
this.visible = true;
this.agencyId = localStorage.getItem("agencyId");
this.dataForm.customerId = localStorage.getItem("customerId");
this.dataForm.staffId = localStorage.getItem("staffId");
this.keyWords = "";
//
setTimeout(() => {
this.$refs['dataForm'].resetFields()
this.dataForm.latitude = ''
this.dataForm.agencyId = ''
this.$refs["dataForm"].resetFields();
this.dataForm.latitude = "";
this.dataForm.agencyId = "";
if (this.dataForm.id) {
this.setPartyOrgType()
this.getInfo()
this.setPartyOrgType();
this.getInfo();
} else {
this.setPartyOrgType()
this.initMap()
this.setPartyOrgType();
this.initMap();
if (this.dataForm.orgId) {
this.dataForm.mySelectOrg = this.dataForm.orgId
this.dataForm.orgPid = this.dataForm.orgId
this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + this.dataForm.orgId : this.dataForm.orgId
this.dataForm.partyOrgType = this.dataForm._partyOrgType
this.dataForm.mySelectOrg = this.dataForm.orgId;
this.dataForm.orgPid = this.dataForm.orgId;
this.dataForm.orgPids = this.dataForm.orgPids
? this.dataForm.orgPids + ":" + this.dataForm.orgId
: this.dataForm.orgId;
this.dataForm.partyOrgType = this.dataForm._partyOrgType;
this.setPartyOrgType_xzxj()
this.getInfoAgencyLisy()
this.setPartyOrgType_xzxj();
this.getInfoAgencyLisy();
} else {
this.dataForm.mySelectOrg = ''
this.dataForm.mySelectOrg = "";
}
}
}, 50);
@ -183,322 +239,381 @@
},
//
setPartyOrgType_xzxj() {
if (this.dataForm.partyOrgType === '0') { // 0,1,2,3,4,5
this.dataForm.partyOrgType = '1'
} else if (this.dataForm.partyOrgType === '1') {
this.dataForm.partyOrgType = '2'
} else if (this.dataForm.partyOrgType === '2') {
this.dataForm.partyOrgType = '3'
} else if (this.dataForm.partyOrgType === '3') {
this.dataForm.partyOrgType = '4'
} else if (this.dataForm.partyOrgType === '4') {
this.dataForm.partyOrgType = '5'
if (this.dataForm.partyOrgType === "0") {
// 0,1,2,3,4,5
this.dataForm.partyOrgType = "1";
} else if (this.dataForm.partyOrgType === "1") {
this.dataForm.partyOrgType = "2";
} else if (this.dataForm.partyOrgType === "2") {
this.dataForm.partyOrgType = "3";
} else if (this.dataForm.partyOrgType === "3") {
this.dataForm.partyOrgType = "4";
} else if (this.dataForm.partyOrgType === "4") {
this.dataForm.partyOrgType = "5";
}
},
//
setPartyOrgType() {
// community:street,: district,: city :province
// 0,1,2,3,4,5
this.level = localStorage.getItem('level') ? localStorage.getItem('level') : ''
if (this.level == 'province') {
this.level = localStorage.getItem("level")
? localStorage.getItem("level")
: "";
if (this.level == "province") {
this.partyOrgTypeList = [
{value: '0', name: '省委'},
{value: '1', name: '市委'},
{value: '2', name: '区委'},
{value: '3', name: '党工委'},
{value: '4', name: '党委'},
{value: '5', name: '支部'}
]
}else if(this.level == 'city'){
{ value: "0", name: "省委" },
{ value: "1", name: "市委" },
{ value: "2", name: "区委" },
{ value: "3", name: "党工委" },
{ value: "4", name: "党委" },
{ value: "5", name: "支部" },
];
} else if (this.level == "city") {
this.partyOrgTypeList = [
{value: '1', name: '市委'},
{value: '2', name: '区委'},
{value: '3', name: '党工委'},
{value: '4', name: '党委'},
{value: '5', name: '支部'}
]
}else if(this.level == 'district'){
{ value: "1", name: "市委" },
{ value: "2", name: "区委" },
{ value: "3", name: "党工委" },
{ value: "4", name: "党委" },
{ value: "5", name: "支部" },
];
} else if (this.level == "district") {
this.partyOrgTypeList = [
{value: '2', name: '区委'},
{value: '3', name: '党工委'},
{value: '4', name: '党委'},
{value: '5', name: '支部'}
]
}else if(this.level == 'street'){
{ value: "2", name: "区委" },
{ value: "3", name: "党工委" },
{ value: "4", name: "党委" },
{ value: "5", name: "支部" },
];
} else if (this.level == "street") {
this.partyOrgTypeList = [
{value: '3', name: '党工委'},
{value: '4', name: '党委'},
{value: '5', name: '支部'}
]
}else if(this.level == 'community'){
{ value: "3", name: "党工委" },
{ value: "4", name: "党委" },
{ value: "5", name: "支部" },
];
} else if (this.level == "community") {
this.partyOrgTypeList = [
{value: '4', name: '党委'},
{value: '5', name: '支部'}
]
{ value: "4", name: "党委" },
{ value: "5", name: "支部" },
];
}
},
//
changeAgencyOrg() {
if(!this.dataForm.orgId){ // orgId
this.getOrgList()
if (!this.dataForm.orgId) {
// orgId
this.getOrgList();
}
},
//
changePartyOrgType(value) {
if(value == '5'){ //
this.dataForm.agencyId = localStorage.getItem('agencyId')
this.dataForm.agencyPids = ''
if (value == "5") {
//
this.dataForm.agencyId = localStorage.getItem("agencyId");
this.dataForm.agencyPids = "";
//
this.orgList = []
this.dataForm.mySelectOrg = '', //
this.dataForm.orgPid = '', // ID,0
this.dataForm.orgPids = ''
this.getOrgList()
this.orgList = [];
(this.dataForm.mySelectOrg = ""), //
(this.dataForm.orgPid = ""), // ID,0
(this.dataForm.orgPids = "");
this.getOrgList();
} else {
//
this.agencyOrgList = []
this.dataForm.agencyId = ''
this.agencyOrgList = [];
this.dataForm.agencyId = "";
//
this.orgList = []
this.dataForm.mySelectOrg = '', //
this.dataForm.orgPid = '', // ID,0
this.dataForm.orgPids = ''
this.getInfoAgencyLisy()
this.orgList = [];
(this.dataForm.mySelectOrg = ""), //
(this.dataForm.orgPid = ""), // ID,0
(this.dataForm.orgPids = "");
this.getInfoAgencyLisy();
}
},
//
getOrgList() {
if (!this.dataForm.id) { //
this.orgList = []
this.dataForm.mySelectOrg = '', //
this.dataForm.orgPid = '', // ID,0
this.dataForm.orgPids = ''
}
this.$http.get('/resi/partymember/icPartyOrg/getParentOrgList', {params: {agencyId: this.dataForm.agencyId, partyOrgType: this.dataForm.partyOrgType}}).then(({data: res}) => {
if (!this.dataForm.id) {
//
this.orgList = [];
(this.dataForm.mySelectOrg = ""), //
(this.dataForm.orgPid = ""), // ID,0
(this.dataForm.orgPids = "");
}
this.$http
.get("/resi/partymember/icPartyOrg/getParentOrgList", {
params: {
agencyId: this.dataForm.agencyId,
partyOrgType: this.dataForm.partyOrgType,
},
})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
return this.$message.error(
res.internalMsg ? res.internalMsg : res.msg ? res.msg : "查询失败"
);
}
this.orgList = this.removeEmptyChildren(res.data)
}).catch(() => {
this.orgList = this.removeEmptyChildren(res.data);
})
.catch(() => {});
},
removeEmptyChildren(orgArray) {
orgArray.forEach((orgInfo) => {
if (orgInfo && orgInfo.children) {
if (orgInfo.children.length === 0) {
orgInfo.children = undefined
orgInfo.children = undefined;
} else {
this.removeEmptyChildren(orgInfo.children)
this.removeEmptyChildren(orgInfo.children);
}
}
})
});
return orgArray;
},
//
handleChangeOrg(e) {
if (this.dataForm.mySelectOrg.length > 0 && this.dataForm.mySelectOrg) {
this.dataForm.orgPid = this.dataForm.mySelectOrg[this.dataForm.mySelectOrg.length - 1]
this.dataForm.orgPids = this.$refs.myOrg.getCheckedNodes()[0].data.orgPids;
this.dataForm.mySelectOrg.forEach(element => {
this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + element : element
this.dataForm.orgPid =
this.dataForm.mySelectOrg[this.dataForm.mySelectOrg.length - 1];
this.dataForm.orgPids =
this.$refs.myOrg.getCheckedNodes()[0].data.orgPids;
this.dataForm.mySelectOrg.forEach((element) => {
this.dataForm.orgPids = this.dataForm.orgPids
? this.dataForm.orgPids + ":" + element
: element;
});
} else {
this.dataForm.orgPid = ''
this.dataForm.orgPids = ''
this.dataForm.orgPid = "";
this.dataForm.orgPids = "";
}
},
//
getInfo() {
this.$http.get(`/resi/partymember/icPartyOrg/${this.dataForm.id}`).then(({data: res}) => {
this.$http
.get(`/resi/partymember/icPartyOrg/${this.dataForm.id}`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
return this.$message.error(
res.internalMsg ? res.internalMsg : res.msg ? res.msg : "查询失败"
);
}
this.dataForm = {
...this.dataForm,
...res.data
}
...res.data,
};
//
this.dataForm.mySelectOrg = this.dataForm.orgPid
this.dataForm.mySelectOrg = this.dataForm.orgPid;
//
this.dataForm.agencyId = this.dataForm.agencyId
this.dataForm.agencyId = this.dataForm.agencyId;
//
this.getInfoAgencyLisy()
this.getInfoAgencyLisy();
//
this.getOrgList()
this.initMap()
}).catch(() => {
this.getOrgList();
this.initMap();
})
.catch(() => {});
},
getInfoAgencyLisy() {
this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.dataForm.pid?this.dataForm.pid:this.agencyId, orgType: this.dataForm.partyOrgType}}).then(({data: res}) => {
this.$http
.get("/gov/org/customeragency/getOrgTreeByUserAndType", {
params: {
agencyId: this.dataForm.pid ? this.dataForm.pid : this.agencyId,
orgType: this.dataForm.partyOrgType,
},
})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
return this.$message.error(
res.internalMsg ? res.internalMsg : res.msg ? res.msg : "查询失败"
);
}
this.agencyOrgList = this.removeEmptyChildren(res.data)
}).catch(() => {
this.agencyOrgList = this.removeEmptyChildren(res.data);
})
.catch(() => {});
},
// init
initMap() {
document.getElementById('app').innerHTML = ''
if (document.getElementById('app')) {
document.getElementById('mapSeach_id').style.display = "block"
document.getElementById("app").innerHTML = "";
if (document.getElementById("app")) {
document.getElementById("mapSeach_id").style.display = "block";
// document.getElementById('lon_lat_id').style.display = "block"
}
//
var center = new window.TMap.LatLng( this.dataForm.latitude ? this.dataForm.latitude : 36.0722275, this.dataForm.longitude ? this.dataForm.longitude : 120.38945519)
var center = new window.TMap.LatLng(
this.dataForm.latitude ? this.dataForm.latitude : 36.0722275,
this.dataForm.longitude ? this.dataForm.longitude : 120.38945519
);
// map TMap.Map()
map = new window.TMap.Map(document.getElementById('app'), {
map = new window.TMap.Map(document.getElementById("app"), {
center: center, //
zoom: 17.2, //
zoom: 16.2, //
pitch: 43.5, //
rotation: 45 //
})
rotation: 45, //
});
search = new window.TMap.service.Search({ pageSize: 10 })
search = new window.TMap.service.Search({ pageSize: 10 });
//
markers = new TMap.MultiMarker({
map: map,
geometries: []
})
infoWindowList = Array(10)
geometries: [],
});
infoWindowList = Array(10);
geocoder = new TMap.service.Geocoder(); //
//
map.on('panend', () => {
this.handleMoveCenter()
})
this.handleMoveCenter()
this.convert()
map.on("panend", () => {
this.handleMoveCenter();
});
this.handleMoveCenter();
this.convert();
},
setMarker(lat, lng) {
markers.setGeometries([])
markers.setGeometries([]);
markers.add([
{
id: '4',
styleId: 'marker',
id: "4",
styleId: "marker",
position: new TMap.LatLng(lat, lng),
properties: {
title: 'marker4'
}
}
])
title: "marker4",
},
},
]);
},
handleSearchMap() {
infoWindowList.forEach((infoWindow) => {
infoWindow.close()
})
infoWindowList.length = 0
markers.setGeometries([])
infoWindow.close();
});
infoWindowList.length = 0;
markers.setGeometries([]);
//
search.searchRectangle({ keyword: this.keyWords, bounds: map.getBounds()}).then((result) => {
let { data } = result
search
.searchNearby({
keyword: this.keyWords,
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result;
if (Array.isArray(data) && data.length > 0) {
const {
location: { lat, lng }
} = data[0]
map.setCenter(new TMap.LatLng(lat, lng))
this.setMarker(lat, lng)
this.dataForm.latitude = lat
this.dataForm.longitude = lng
this.convert()
location: { lat, lng },
} = data[0];
map.setCenter(new TMap.LatLng(lat, lng));
this.setMarker(lat, lng);
this.dataForm.latitude = lat;
this.dataForm.longitude = lng;
this.convert();
} else {
this.$message.error('未检索到相关位置坐标')
this.$message.error("未检索到相关位置坐标");
}
})
});
},
handleMoveCenter() {
//
const center = map.getCenter()
const lat = center.getLat()
const lng = center.getLng()
const center = map.getCenter();
const lat = center.getLat();
const lng = center.getLng();
if (lng === 120.38945519) {
this.dataForm.latitude = ''
this.dataForm.longitude = ''
this.dataForm.latitude = "";
this.dataForm.longitude = "";
} else {
this.dataForm.latitude = lat
this.dataForm.longitude = lng
this.dataForm.latitude = lat;
this.dataForm.longitude = lng;
}
this.setMarker(lat, lng)
this.convert(lat, lng)
this.setMarker(lat, lng);
this.convert(lat, lng);
},
convert(lat, lng) {
markers.setGeometries([]);
// var input = document.getElementById('location').value.split(':');
let location
let location;
if (lat && lng) {
location = new TMap.LatLng(lat, lng);
} else {
location = new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude);
location = new TMap.LatLng(
this.dataForm.latitude,
this.dataForm.longitude
);
}
// map.setCenter(location);
markers.updateGeometries([
{
id: 'main', //
id: "main", //
position: location,
},
]);
//
geocoder.getAddress({ location: location }).then((result) => {
this.dataForm.address = result.result.address
this.dataForm.address = result.result.address;
//
});
},
//
dataFormSubmitHandle: debounce(function () {
dataFormSubmitHandle: debounce(
function () {
if (!this.dataForm.latitude || !this.dataForm.longitude) {
return this.$message.error('请滑动地图选择党组织位置')
return this.$message.error("请滑动地图选择党组织位置");
}
if (this.dataForm.orgPids === '0') {
this.dataForm.orgPids = ''
if (this.dataForm.orgPids === "0") {
this.dataForm.orgPids = "";
}
this.$refs['dataForm'].validate((valid) => {
this.$refs["dataForm"].validate((valid) => {
if (!valid) {
return false
return false;
}
this.$http[!this.dataForm.id ? 'post' : 'put']('/resi/partymember/icPartyOrg/', this.dataForm).then(({data: res}) => {
this.$http[!this.dataForm.id ? "post" : "put"](
"/resi/partymember/icPartyOrg/",
this.dataForm
)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
return this.$message.error(
res.internalMsg
? res.internalMsg
: res.msg
? res.msg
: "查询失败"
);
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
message: this.$t("prompt.success"),
type: "success",
duration: 500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
}).catch(() => {
})
this.visible = false;
this.$emit("refreshDataList");
},
});
})
}, 1000, {'leading': true, 'trailing': false})
.catch(() => {});
});
},
1000,
{ leading: true, trailing: false }
),
},
computed: {
dataRule() {
return {
partyOrgName: [
{required: true, message: "党组织名称不能为空", trigger: 'blur'}
{ required: true, message: "党组织名称不能为空", trigger: "blur" },
],
mySelectOrg: [
{required: true, message: "上级党组织不能为空", trigger: 'blur'}
{ required: true, message: "上级党组织不能为空", trigger: "blur" },
],
partyOrgType: [
{required: true, message: "党组织类型不能为空", trigger: 'blur'}
{ required: true, message: "党组织类型不能为空", trigger: "blur" },
],
agencyId: [
{required: true, message: "行政组织不能为空", trigger: 'blur'}
]
}
}
}
}
{ required: true, message: "行政组织不能为空", trigger: "blur" },
],
};
},
},
};
</script>
<style lang="scss" scoped>
@ -513,7 +628,6 @@
}
}
.div_map {
position: relative;
}

6
src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue

@ -282,9 +282,11 @@ export default {
markers.setGeometries([]);
//
search
.searchRectangle({
.searchNearby({
keyword: this.dataForm.address,
bounds: map.getBounds(),
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result;

6
src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue

@ -367,9 +367,11 @@ export default {
markers.setGeometries([]);
//
search
.searchRectangle({
.searchNearby({
keyword: this.dataForm.address,
bounds: map.getBounds(),
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result;

308
src/views/modules/renFangTongJi/index.vue

@ -0,0 +1,308 @@
<template>
<el-card class="g-cnt">
<div class="m-cards">
<div class="item" :key="item.name" v-for="item in list">
<div class="item-left">
<div class="num">{{ item.num }}</div>
<div class="name">{{ item.name }}</div>
</div>
<div class="item-right">
<div class="hint">
<div class="hint-title">较上月</div>
<b v-if="item.variation >= 0">+ {{ item.variationAbs }}</b>
<b v-else>- {{ item.variationAbs }}</b>
</div>
</div>
</div>
</div>
<div class="m-tb">
<h3>下级平台使用进度汇总</h3>
<el-table
:data="tableData"
border
style="width: 100%"
class="tb"
:height="maxTableHeight"
>
<el-table-column label="序号" type="index" align="center" width="50" />
<el-table-column prop="orgName" label="所属组织"> </el-table-column>
<el-table-column prop="usingCommunityNum" label="开通平台社区数">
</el-table-column>
<el-table-column prop="userTotal" label="人口总数"></el-table-column>
<el-table-column
prop="czUserTotal"
label="常住人口总数"
></el-table-column>
<el-table-column
prop="ldUserTotal"
label="流动人口总数"
></el-table-column>
<el-table-column prop="houseTotal" label="房屋总数"></el-table-column>
<el-table-column
prop="zzHouseTotal"
label="自住房屋总数"
></el-table-column>
<el-table-column
prop="czHouseTotal"
label="出租房屋总数"
></el-table-column>
<el-table-column
prop="xzHouseTotal"
label="闲置房屋总数"
></el-table-column>
</el-table>
</div>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="displayedDetail"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="开放社区数"
width="850px"
top="5vh"
@closed="displayedDetail = false"
>
</el-dialog>
</el-card>
</template>
<script>
import { requestPost } from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex";
export default {
name: "renFangTongJi",
components: {},
data() {
return {
displayedDetail: false,
tableData: [],
orgId: "",
orgType: "",
list: [
{
name: "开通平台社区数",
num: "--",
variation: 0,
variationAbs: "0",
},
{
name: "人口总数",
num: "--",
variation: 0,
variationAbs: "0",
},
{
name: "常住人口数",
num: "--",
variation: 0,
variationAbs: "0",
},
{
name: "流动人口数",
num: "--",
variation: 0,
variationAbs: "0",
},
{
name: "房屋总数",
num: "--",
variation: 0,
variationAbs: "0",
},
{
name: "自住房屋数",
num: "--",
variation: 0,
variationAbs: "0",
},
{
name: "出租房屋数",
num: "--",
variation: 0,
variationAbs: "0",
},
{
name: "闲置房屋数",
num: "--",
variation: 0,
variationAbs: "0",
},
],
};
},
computed: {
maxTableHeight() {
return this.clientHeight - 420;
},
...mapGetters(["clientHeight"]),
},
watch: {
orgId() {
this.getTableData();
},
},
mounted() {
this.getCommunityData();
this.getResiData();
this.getHouseData();
this.getTableData();
},
methods: {
async getCommunityData() {
const url = "/gov/org/agency/usingCommunityStats";
const { data, code, msg } = await requestPost(url, {
orgId: this.orgId,
orgType: this.orgType,
});
if (code === 0) {
const { list } = this;
let item1 = list.find((item) => item.name == "开通平台社区数");
item1.num = data.usingCommunityNum;
item1.variation = parseInt(data.usingCommunityNumJSY);
item1.variationAbs = Math.abs(item1.variation);
}
},
async getResiData() {
const url = "/epmetuser/icresiuser/userchart";
const { data, code, msg } = await requestPost(url, {
orgId: this.orgId,
orgType: this.orgType,
});
if (code === 0) {
const { list } = this;
let item1 = list.find((item) => item.name == "人口总数");
item1.num = data.userTotal;
item1.variation = parseInt(data.userTotalJSY);
item1.variationAbs = Math.abs(item1.variation);
let item2 = list.find((item) => item.name == "常住人口数");
item2.num = data.czUserTotal;
item2.variation = parseInt(data.czUserTotalJSY);
item2.variationAbs = Math.abs(item2.variation);
let item3 = list.find((item) => item.name == "流动人口数");
item3.num = data.ldUserTotal;
item3.variation = parseInt(data.ldUserTotalJSY);
item3.variationAbs = Math.abs(item3.variation);
}
},
async getHouseData() {
const url = "/gov/org/house/housechart";
const { data, code, msg } = await requestPost(url, {
orgId: this.orgId,
orgType: this.orgType,
});
if (code === 0) {
const { list } = this;
let item1 = list.find((item) => item.name == "房屋总数");
item1.num = data.houseTotal;
item1.variation = parseInt(data.houseTotalJSY);
item1.variationAbs = Math.abs(item1.variation);
let item2 = list.find((item) => item.name == "自住房屋数");
item2.num = data.zzHouseTotal;
item2.variation = parseInt(data.zzHouseTotalJSY);
item2.variationAbs = Math.abs(item2.variation);
let item3 = list.find((item) => item.name == "出租房屋数");
item3.num = data.czHouseTotal;
item3.variation = parseInt(data.czHouseTotalJSY);
item3.variationAbs = Math.abs(item3.variation);
let item4 = list.find((item) => item.name == "闲置房屋数");
item4.num = data.xzHouseTotal;
item4.variation = parseInt(data.xzHouseTotalJSY);
item4.variationAbs = Math.abs(item4.variation);
}
},
async getTableData() {
const url = "/gov/org/house/subuserhouselist";
const { data, code, msg } = await requestPost(url, {
orgId: this.orgId,
orgType: this.orgType,
});
if (code === 0) {
this.tableData = data
? data.map((item) => {
return item;
})
: [];
}
},
},
};
</script>
<style lang="scss" scoped>
@import "@/assets/scss/c/config";
@import "@/assets/scss/c/function";
.m-cards {
display: flex;
flex-wrap: wrap;
// align-items: center;
.item {
display: flex;
width: 24%;
margin-top: 15px;
margin-right: 1%;
box-sizing: border-box;
color: #ffffff;
padding: 12px;
border-radius: 4px;
background-image: linear-gradient(to left, #43c8c4, #2aa5c6);
.item-right {
margin-left: auto;
}
.item-left {
text-align: center;
}
.num {
font-size: 28px;
font-weight: bold;
line-height: 40px;
}
.name {
font-size: 14px;
line-height: 20px;
}
.hint {
margin-top: 10px;
line-height: 20px;
text-align: center;
font-size: 18px;
.hint-title {
font-size: 14px;
}
}
}
}
.m-tb {
margin-top: 20px;
}
</style>

8
src/views/modules/shequzhili/csgltc/csglForm.vue

@ -307,7 +307,7 @@ export default {
// map TMap.Map()
map = new window.TMap.Map(document.getElementById('app'), {
center: center, //
zoom: 17.2, //
zoom: 16.2, //
pitch: 43.5, //
rotation: 45 //
})
@ -352,9 +352,11 @@ export default {
markers.setGeometries([])
//
search
.searchRectangle({
.searchNearby({
keyword: this.formData.address,
bounds: map.getBounds()
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result

8
src/views/modules/shequzhili/event/cpts/add.vue

@ -625,7 +625,7 @@ export default {
// map TMap.Map()
map = new window.TMap.Map(document.getElementById("app"), {
center: center, //
zoom: 17.2, //
zoom: 16.2, //
pitch: 43.5, //
rotation: 45, //
});
@ -670,9 +670,11 @@ export default {
markers.setGeometries([]);
//
search
.searchRectangle({
.searchNearby({
keyword: this.keyWords,
bounds: map.getBounds(),
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result;

8
src/views/modules/shequzhili/ggfwtc/ggfwForm.vue

@ -284,7 +284,7 @@ export default {
// map TMap.Map()
map = new window.TMap.Map(document.getElementById('app'), {
center: center, //
zoom: 17.2, //
zoom: 16.2, //
pitch: 43.5, //
rotation: 45 //
})
@ -329,9 +329,11 @@ export default {
markers.setGeometries([])
//
search
.searchRectangle({
.searchNearby({
keyword: this.formData.address,
bounds: map.getBounds()
radius: 1000,
autoExtend: true,
center: map.getCenter(),
})
.then((result) => {
let { data } = result

Loading…
Cancel
Save