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. 1010
      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. 294
      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. 1060
      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([]) markers.setGeometries([])
// //
search search
.searchRectangle({ .searchNearby({
keyword: this.keyWords, keyword: this.keyWords,
bounds: map.getBounds() radius: 1000,
autoExtend: true,
center: map.getCenter(),
}) })
.then((result) => { .then((result) => {
let { data } = result let { data } = result

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -2,76 +2,90 @@
<div> <div>
<div> <div>
<el-form <el-form
ref="ref_form" ref="ref_form"
:inline="true" :inline="true"
:model="dataForm" :model="dataForm"
:rules="dataRule" :rules="dataRule"
:disabled="formType === 'detail'" :disabled="formType === 'detail'"
class="form" class="form"
> >
<el-form-item
<el-form-item label="头像" label-width="150px" label="头像"
prop="imageList" label-width="150px"
style="display: block"> prop="imageList"
style="display: block"
>
<div class="imsg-list"> <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 <el-image
style="width: 100px; height: 100px" style="width: 100px; height: 100px"
:src="item" :src="item"
fit="fill" 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> <i class="el-icon-delete" @click="handleDelimg(item, index)"></i>
</div> </div>
<el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" <el-upload
v-if="dataForm.imageList.length < 1 && !disabled" :headers="$getElUploadHeaders()"
:action="uploadUlr" class="avatar-uploader"
:data="{customerId:customerId}" v-if="dataForm.imageList.length < 1 && !disabled"
:show-file-list="false" :action="uploadUlr"
:disabled="disabled" :data="{ customerId: customerId }"
:on-progress="handleProgress" :show-file-list="false"
:on-success="handleImgSuccess" :disabled="disabled"
:before-upload="beforeImgUpload" :on-progress="handleProgress"
accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"> :on-success="handleImgSuccess"
<el-progress v-if="uploading" :width="100" type="circle" :percentage="unloadPencent"></el-progress> :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>
<i v-else class="el-icon-plus avatar-uploader-icon"></i> <i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload> </el-upload>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="组织名称 " label="组织名称 "
prop="societyName" prop="societyName"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >
<el-input <el-input
class="item_width_1" class="item_width_1"
maxlength="50" maxlength="50"
show-word-limit show-word-limit
placeholder="请输入组织名称 " placeholder="请输入组织名称 "
v-model="dataForm.societyName" v-model="dataForm.societyName"
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="服务内容" label="服务内容"
prop="serviceMatters" prop="serviceMatters"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >
<el-input <el-input
class="item_width_1" class="item_width_1"
type="textarea" type="textarea"
maxlength="1000" maxlength="1000"
show-word-limit show-word-limit
:rows="3" :rows="3"
placeholder="请输入服务内容,不超过1000字" placeholder="请输入服务内容,不超过1000字"
v-model="dataForm.serviceMatters" v-model="dataForm.serviceMatters"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item <!-- <el-form-item
label="负责人姓名 " label="负责人姓名 "
prop="personInCharge" prop="personInCharge"
label-width="150px" label-width="150px"
@ -88,36 +102,36 @@
</el-form-item>--> </el-form-item>-->
<el-form-item <el-form-item
label="服务电话 " label="服务电话 "
prop="mobile" prop="mobile"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >
<el-input <el-input
class="item_width_1" class="item_width_1"
maxlength="50" maxlength="50"
show-word-limit show-word-limit
placeholder="请输入服务电话 " placeholder="请输入服务电话 "
v-model="dataForm.mobile" v-model="dataForm.mobile"
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="服务时间 " label="服务时间 "
prop="serviceTimeStr" prop="serviceTimeStr"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >
<el-input <el-input
class="item_width_1" class="item_width_1"
maxlength="50" maxlength="50"
show-word-limit show-word-limit
placeholder="请输入服务时间 " placeholder="请输入服务时间 "
v-model="dataForm.serviceTimeStr" v-model="dataForm.serviceTimeStr"
> >
</el-input> </el-input>
<!-- <el-date-picker <!-- <el-date-picker
v-model="dataForm.serviceTime" v-model="dataForm.serviceTime"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
@ -129,23 +143,23 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="绑定管理员" label="绑定管理员"
prop="adminStaffId" prop="adminStaffId"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >
<el-select <el-select
class="item_width_1" class="item_width_1"
v-model="dataForm.adminStaffId" v-model="dataForm.adminStaffId"
placeholder="请选择" placeholder="请选择"
clearable clearable
filterable filterable
> >
<el-option <el-option
v-for="item in staffList" v-for="item in staffList"
:key="item.staffId" :key="item.staffId"
:label="item.staffName" :label="item.staffName"
:value="item.staffId" :value="item.staffId"
> >
</el-option> </el-option>
</el-select> </el-select>
@ -198,21 +212,20 @@
<div class="div_btn"> <div class="div_btn">
<el-button @click="handleCancle"> </el-button> <el-button @click="handleCancle"> </el-button>
<el-button <el-button
v-if="formType != 'detail'" v-if="formType != 'detail'"
type="primary" type="primary"
:disabled="btnDisable" :disabled="btnDisable"
@click="handleComfirm" @click="handleComfirm"
> >
</el-button </el-button>
>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import {Loading} from "element-ui"; // Loading import { Loading } from "element-ui"; // Loading
import {requestPost} from "@/js/dai/request"; import { requestPost } from "@/js/dai/request";
var map; var map;
var search; var search;
@ -223,11 +236,11 @@ let loading; // 加载动画
export default { export default {
data() { data() {
return { return {
uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2', uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
btnLoading: false, btnLoading: false,
uploading: false, uploading: false,
disabled: false, disabled: false,
customerId: '', customerId: "",
formType: "add", // addeditdetail formType: "add", // addeditdetail
agencyId: "", agencyId: "",
@ -259,7 +272,7 @@ export default {
dataRule() { dataRule() {
return { return {
societyName: [ societyName: [
{required: true, message: "组织名称 不能为空", trigger: "blur"}, { required: true, message: "组织名称 不能为空", trigger: "blur" },
{ {
min: 1, min: 1,
max: 50, max: 50,
@ -268,10 +281,10 @@ export default {
}, },
], ],
imageList: [ imageList: [
{required: true, message: "头像不能为空", trigger: "blur"}, { required: true, message: "头像不能为空", trigger: "blur" },
], ],
serviceMatters: [ serviceMatters: [
{required: true, message: "服务内容不能为空", trigger: "blur"}, { required: true, message: "服务内容不能为空", trigger: "blur" },
], ],
/*personInCharge: [ /*personInCharge: [
{required: true, message: "负责人姓名不能为空", trigger: "blur"}, {required: true, message: "负责人姓名不能为空", trigger: "blur"},
@ -280,10 +293,10 @@ export default {
{ required: true, message: "绑定管理员不能为空", trigger: "blur" }, { required: true, message: "绑定管理员不能为空", trigger: "blur" },
],*/ ],*/
mobile: [ mobile: [
{required: true, message: "服务电话不能为空", trigger: "blur"}, { required: true, message: "服务电话不能为空", trigger: "blur" },
], ],
serviceTimeStr: [ serviceTimeStr: [
{required: true, message: "服务时间不能为空", trigger: "blur"}, { required: true, message: "服务时间不能为空", trigger: "blur" },
], ],
/*longitude: [ /*longitude: [
{ required: true, message: "位置坐标不能为空", trigger: "blur" }, { required: true, message: "位置坐标不能为空", trigger: "blur" },
@ -316,12 +329,12 @@ export default {
// map TMap.Map() // map TMap.Map()
map = new window.TMap.Map(document.getElementById("app"), { map = new window.TMap.Map(document.getElementById("app"), {
center: center, // center: center, //
zoom: 17.2, // zoom: 16.2, //
pitch: 43.5, // 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({ markers = new TMap.MultiMarker({
map: map, map: map,
@ -358,52 +371,54 @@ export default {
markers.setGeometries([]); markers.setGeometries([]);
// //
search search
.searchRectangle({ .searchNearby({
keyword: this.dataForm.address, keyword: this.dataForm.address,
bounds: map.getBounds(), radius: 1000,
}) autoExtend: true,
.then((result) => { center: map.getCenter(),
let {data} = result; })
if (Array.isArray(data) && data.length > 0) { .then((result) => {
const { let { data } = result;
location: {lat, lng}, if (Array.isArray(data) && data.length > 0) {
} = data[0]; const {
map.setCenter(new TMap.LatLng(lat, lng)); location: { lat, lng },
this.setMarker(lat, lng); } = data[0];
this.dataForm.latitude = lat; map.setCenter(new TMap.LatLng(lat, lng));
this.dataForm.longitude = lng; this.setMarker(lat, lng);
} else { this.dataForm.latitude = lat;
this.$message.error("未检索到相关位置坐标"); this.dataForm.longitude = lng;
} } else {
}); this.$message.error("未检索到相关位置坐标");
}
});
}, },
beforeImgUpload(file) { beforeImgUpload(file) {
const isPNG = (file.type === 'image/png') || (file.type === 'image/jpeg') const isPNG = file.type === "image/png" || file.type === "image/jpeg";
const isLt1M = file.size / 1024 / 1024 < 10 const isLt1M = file.size / 1024 / 1024 < 10;
if (!isPNG) { if (!isPNG) {
this.$message.error('上传图片只能是 PNG 或 JPEG 格式!') this.$message.error("上传图片只能是 PNG 或 JPEG 格式!");
} }
if (!isLt1M) { if (!isLt1M) {
this.$message.error('上传图片大小不能超过 10MB!') this.$message.error("上传图片大小不能超过 10MB!");
} }
return isPNG && isLt1M return isPNG && isLt1M;
}, },
handleProgress(event, file, fileList) { handleProgress(event, file, fileList) {
this.uploading = true this.uploading = true;
this.unloadPencent = Number(file.percentage.toFixed(0)) this.unloadPencent = Number(file.percentage.toFixed(0));
}, },
handleImgSuccess(res, file) { handleImgSuccess(res, file) {
if (res.code === 0 && res.msg === 'success') { if (res.code === 0 && res.msg === "success") {
this.uploading = false this.uploading = false;
this.unloadPencent = 0 this.unloadPencent = 0;
this.dataForm.imageList.push(res.data.url) this.dataForm.imageList.push(res.data.url);
} else { } else {
this.$message.error(res.msg) this.$message.error(res.msg);
} }
}, },
handleDelimg(item, index) { handleDelimg(item, index) {
this.dataForm.imageList.splice(index, 1) this.dataForm.imageList.splice(index, 1);
}, },
handleMoveCenter() { handleMoveCenter() {
// //
@ -419,9 +434,9 @@ export default {
this.$refs.ref_form.resetFields(); this.$refs.ref_form.resetFields();
this.formType = type; this.formType = type;
this.dataForm.imageList = [] this.dataForm.imageList = [];
if (row) { if (row) {
this.dataForm = {...this.dataForm, ...row}; this.dataForm = { ...this.dataForm, ...row };
if (row.imgUrl) { if (row.imgUrl) {
this.dataForm.imageList.push(row.imgUrl); this.dataForm.imageList.push(row.imgUrl);
} }
@ -436,7 +451,7 @@ export default {
async loadAgency() { async loadAgency() {
const url = "/epmetuser/customerstaff/staffbasicinfo"; const url = "/epmetuser/customerstaff/staffbasicinfo";
let params = {}; let params = {};
const {data, code, msg} = await requestPost(url, params); const { data, code, msg } = await requestPost(url, params);
if (code === 0) { if (code === 0) {
this.agencyId = data.agencyId; this.agencyId = data.agencyId;
@ -455,7 +470,7 @@ export default {
pageSize: 100000, pageSize: 100000,
}; };
const {data, code, msg} = await requestPost(url, params); const { data, code, msg } = await requestPost(url, params);
if (code === 0) { if (code === 0) {
this.staffList = data.staffList.map((item) => { this.staffList = data.staffList.map((item) => {
@ -485,7 +500,6 @@ export default {
}, },
async submit() { async submit() {
let url = ""; let url = "";
if (this.formType === "add") { if (this.formType === "add") {
url = "/heart/societyorg/add"; url = "/heart/societyorg/add";
@ -496,7 +510,7 @@ export default {
this.dataForm.societyId = this.societyId; this.dataForm.societyId = this.societyId;
} }
const {data, code, msg} = await requestPost(url, this.dataForm); const { data, code, msg } = await requestPost(url, this.dataForm);
if (code === 0) { if (code === 0) {
this.$message({ this.$message({
@ -520,7 +534,7 @@ export default {
this.societyId = ""; //ID this.societyId = ""; //ID
this.$refs.ref_form.resetFields(); this.$refs.ref_form.resetFields();
this.propertyFormShow = false; this.propertyFormShow = false;
/* /*
this.dataForm = { this.dataForm = {
societyName: "", societyName: "",
serviceMatters: "", serviceMatters: "",
@ -535,7 +549,6 @@ export default {
latitude: "", latitude: "",
imageList:[] imageList:[]
};*/ };*/
}, },
// //
startLoading() { startLoading() {
@ -597,15 +610,14 @@ export default {
} }
.avatar-uploader { .avatar-uploader {
::v-deep ::v-deep .el-upload {
.el-upload {
cursor: pointer; cursor: pointer;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
.el-upload:hover { .el-upload:hover {
border-color: #409EFF; border-color: #409eff;
} }
.avatar { .avatar {

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

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

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

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

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

File diff suppressed because it is too large

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

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

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

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

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

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

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

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

Loading…
Cancel
Save