elink-star
/
epmet-oper-gov
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev-tuceng0616' into dev

test
zxc 3 years ago
parent
09bb356019 52f3066d1e
commit
a6a6a60040
18 changed files with 305 additions and 130 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .env.development
  2. 1
      package.json
  3. 2
      src/views/modules/base/community/roomForm.vue
  4. 21
      src/views/modules/communityService/dqfwzx/cpts/edit.vue
  5. 10
      src/views/modules/communityService/sqzzz/cpts/edit.vue
  6. 49
      src/views/modules/cpts/base/cpts/edit.vue
  7. 30
      src/views/modules/cpts/base/index.vue
  8. 2
      src/views/modules/shequzhili/csgltc/csgl.vue
  9. 44
      src/views/modules/shequzhili/csgltc/csglDetail.vue
  10. 17
      src/views/modules/shequzhili/csgltc/csglForm.vue
  11. 4
      src/views/modules/shequzhili/ggfwtc/ggfw.vue
  12. 34
      src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
  13. 18
      src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
  14. 16
      src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
  15. 8
      src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
  16. 16
      src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
  17. 153
      src/views/modules/shequzhili/tuceng/zhonghe/base.vue
  18. 9
      src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

1
.env.development
View File

@ -1,6 +1,7 @@
NODE_ENV=development NODE_ENV=development
# VUE_APP_API_SERVER = http://epmet-dev.elinkservice.cn:41080/api # VUE_APP_API_SERVER = http://epmet-dev.elinkservice.cn:41080/api
VUE_APP_API_SERVER = http://192.168.1.140/api VUE_APP_API_SERVER = http://192.168.1.140/api
# VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api # VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api

1
package.json
View File

@ -18,6 +18,7 @@
"dependencies": { "dependencies": {
"@riophae/vue-treeselect": "^0.4.0", "@riophae/vue-treeselect": "^0.4.0",
"@tinymce/tinymce-vue": "^3.2.8", "@tinymce/tinymce-vue": "^3.2.8",
"async-validator": "^4.2.5",
"axios": "^0.19.0", "axios": "^0.19.0",
"babel-eslint": "^8.0.1", "babel-eslint": "^8.0.1",
"babel-plugin-component": "^1.1.1", "babel-plugin-component": "^1.1.1",

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

@ -11,7 +11,7 @@
<el-form-item label="所属楼栋" <el-form-item label="所属楼栋"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<span>{{ agencyObj.neighborHoodName }}{{agencyObj.label}}</span> <span>{{ dataForm.neighborHoodName }}{{dataForm.buildingName}}</span>
</el-form-item> </el-form-item>
<el-form-item label="单元号" <el-form-item label="单元号"

21
src/views/modules/communityService/dqfwzx/cpts/edit.vue
View File

@ -140,7 +140,7 @@
>查询</el-button >查询</el-button
> >
<div id="app" class="div_map"></div> <div id="app" class="div_map"></div>
<div style="margin-top: 10px"> <div style="margin-top: 10px" v-show="false">
<span>经度</span> <span>经度</span>
<el-input <el-input
class="item_width_3" class="item_width_3"
@ -292,6 +292,7 @@ var search;
var markers; var markers;
var infoWindowList; var infoWindowList;
let loading; // 加载动画 let loading; // 加载动画
var geocoder; // 新建一个正逆地址解析类
export default { export default {
data() { data() {
@ -461,11 +462,13 @@ export default {
}); });
infoWindowList = Array(10); infoWindowList = Array(10);
geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
// 监听地图平移结束 // 监听地图平移结束
map.on("panend", () => { map.on("panend", (e) => {
this.handleMoveCenter(); this.handleMoveCenter(e);
}); });
this.handleMoveCenter(); // this.handleMoveCenter();
}, },
setMarker(lat, lng) { setMarker(lat, lng) {
@ -510,7 +513,7 @@ export default {
}); });
}, },
handleMoveCenter() { handleMoveCenter(e) {
//修改地图中心点 //修改地图中心点
const center = map.getCenter(); const center = map.getCenter();
const lat = center.getLat(); const lat = center.getLat();
@ -518,6 +521,14 @@ export default {
this.dataForm.latitude = lat; this.dataForm.latitude = lat;
this.dataForm.longitude = lng; this.dataForm.longitude = lng;
this.setMarker(lat, lng); this.setMarker(lat, lng);
if (e && e.originalEvent) {
geocoder
.getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址
.then((result) => {
this.dataForm.locationAddress = result.result.address;
});
}
}, },
async initForm(type, row) { async initForm(type, row) {

10
src/views/modules/communityService/sqzzz/cpts/edit.vue
View File

@ -186,13 +186,13 @@
</el-input> </el-input>
<el-button <el-button
style="margin-left: 10px" style="margin-left: 10px"
type="primary" type="default"
size="small" size="small"
@click="handleSearchMap" @click="handleSearchMap"
>查询</el-button >查询</el-button
> >
<div id="app" class="div_map"></div> <div id="app" class="div_map"></div>
<div style="margin-top: 10px"> <div style="margin-top: 10px" v-show="false">
<span>经度</span> <span>经度</span>
<el-input <el-input
class="item_width_3" class="item_width_3"
@ -315,7 +315,7 @@ export default {
{ required: true, message: "联系电话不能为空", trigger: "blur" }, { required: true, message: "联系电话不能为空", trigger: "blur" },
], ],
longitude: [ longitude: [
{ required: true, message: "位置坐标不能为空", trigger: "blur" }, { required: true, message: "请拖动地图选择坐标点", trigger: "blur" },
], ],
}; };
}, },
@ -420,7 +420,7 @@ export default {
map.on("panend", (e) => { map.on("panend", (e) => {
this.handleMoveCenter(e); this.handleMoveCenter(e);
}); });
this.handleMoveCenter(); // this.handleMoveCenter();
}, },
setMarker(lat, lng) { setMarker(lat, lng) {
@ -613,7 +613,7 @@ export default {
width: 200px; width: 200px;
} }
.item_width_4 { .item_width_4 {
width: 200px; width: 430px;
} }
.div_map { .div_map {

49
src/views/modules/cpts/base/cpts/edit.vue
View File

@ -110,11 +110,12 @@
style="margin-left: 10px" style="margin-left: 10px"
type="default" type="default"
size="small" size="small"
ref="mapSearch"
@click="handleSearchMap(item)" @click="handleSearchMap(item)"
>查询</el-button >查询</el-button
> >
<div id="app" class="div_map"></div> <div id="app" class="div_map"></div>
<div style="margin-top: 10px"> <div style="margin-top: 10px" v-show="false">
<span>经度</span> <span>经度</span>
<el-input <el-input
class="address-item-input2" class="address-item-input2"
@ -241,7 +242,7 @@
>查询</el-button >查询</el-button
> >
<div id="app" class="div_map"></div> <div id="app" class="div_map"></div>
<div style="margin-top: 10px"> <div style="margin-top: 10px" v-show="false">
<span>经度</span> <span>经度</span>
<el-input <el-input
class="address-item-input2" class="address-item-input2"
@ -301,6 +302,7 @@
<script> <script>
import { requestPost } from "@/js/dai/request"; import { requestPost } from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick"; import nextTick from "dai-js/tools/nextTick";
import Schema from "async-validator";
var map; var map;
var search; var search;
@ -349,14 +351,16 @@ export default {
}, },
editFixedParams: { editFixedParams: {
type: Object, type: Object,
default: () => { default: () => ({}),
return {};
},
}, },
editParamsDiv: { editParamsDiv: {
type: Number, type: Number,
default: 0, default: 0,
}, },
editElseRules: {
type: Object,
default: () => ({}),
},
}, },
data() { data() {
@ -460,7 +464,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: 15, // 设置地图缩放级别
pitch: 43.5, // 设置俯仰角 pitch: 43.5, // 设置俯仰角
rotation: 45, // 设置地图旋转角度 rotation: 45, // 设置地图旋转角度
}); });
@ -479,7 +483,7 @@ export default {
map.on("panend", (e) => { map.on("panend", (e) => {
this.handleMoveCenter(item, e); this.handleMoveCenter(item, e);
}); });
this.handleMoveCenter(item); // this.handleMoveCenter(item);
}, },
setMarker(lat, lng) { setMarker(lat, lng) {
@ -566,11 +570,16 @@ export default {
...this.fmData, ...this.fmData,
...data, ...data,
}; };
console.log("------------------------------------info", this.fmData);
await nextTick(800); await nextTick(600);
if (map && data.latitude) { if (map) {
map.setCenter(new TMap.LatLng(data.latitude, data.longitude)); if (data.latitude) {
map.setCenter(new TMap.LatLng(data.latitude, data.longitude));
} else {
if (this.formType == "edit" && this.$refs && this.$refs.mapSearch) {
this.$refs.mapSearch[0].handleClick();
}
}
} }
} else { } else {
this.$message.error(msg); this.$message.error(msg);
@ -587,12 +596,28 @@ export default {
this.btnDisable = false; this.btnDisable = false;
}, 5000); }, 5000);
console.log(this.$refs["ref_form"]);
this.$refs["ref_form"].validate((valid, messageObj) => { this.$refs["ref_form"].validate((valid, messageObj) => {
console.log(valid, messageObj);
if (!valid) { if (!valid) {
app.util.validateRule(messageObj); app.util.validateRule(messageObj);
this.btnDisable = false; this.btnDisable = false;
} else { } else {
this.submit(); if (this.editElseRules) {
const validator = new Schema(this.editElseRules);
validator
.validate(this.fmData)
.then(() => {
this.submit();
})
.catch(({ err, fields }) => {
console.log("--------------", err, fields);
app.util.validateRule(fields);
});
} else {
this.submit();
}
} }
}); });
}, },

30
src/views/modules/cpts/base/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="div_main"> <div class="div_main">
<div v-show="true"> <div v-show="true">
<div class="div_search"> <div class="div_search" ref="ref_search">
<el-form :inline="true" ref="ref_searchform" label-width="100px"> <el-form :inline="true" ref="ref_searchform" label-width="100px">
<div> <div>
<el-form-item <el-form-item
@ -211,6 +211,7 @@
:editUrl="editUrl" :editUrl="editUrl"
:editParams="editParams" :editParams="editParams"
:editParamsDiv="editParamsDiv" :editParamsDiv="editParamsDiv"
:editElseRules="editElseRules"
:editFixedParams="editFixedParams" :editFixedParams="editFixedParams"
:formBtnFixed="formBtnFixed" :formBtnFixed="formBtnFixed"
@close="handleClose" @close="handleClose"
@ -234,6 +235,7 @@ import { requestPost } from "@/js/dai/request";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import axios from "axios"; import axios from "axios";
import editForm from "./cpts/edit"; import editForm from "./cpts/edit";
import nextTick from "dai-js/tools/nextTick";
export default { export default {
components: { editForm }, components: { editForm },
@ -304,11 +306,13 @@ export default {
type: Array, type: Array,
default: () => [], default: () => [],
}, },
editElseRules: {
type: Object,
default: () => ({}),
},
editFixedParams: { editFixedParams: {
type: Object, type: Object,
default: () => { default: () => ({}),
return {};
},
}, },
editParamsDiv: { editParamsDiv: {
type: Number, type: Number,
@ -338,21 +342,24 @@ export default {
formShow: false, formShow: false,
formTitle: "详情", formTitle: "详情",
formType: "", // 列表list 新增add 修改edit 详情info formType: "", // 列表list 新增add 修改edit 详情info
ref_search_height: 100,
}; };
}, },
computed: { computed: {
maxTableHeight() { maxTableHeight() {
const { ref_search_height } = this;
return this.$store.state.inIframe return this.$store.state.inIframe
? this.clientHeight - 410 + this.iframeHeigh ? this.clientHeight - ref_search_height - 260 + this.iframeHeight
: this.clientHeight - 410; : this.clientHeight - ref_search_height - 260;
}, },
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
}, },
watch: {}, watch: {},
mounted() { async mounted() {
console.log(this.$store.state); console.log(this.$store.state);
this.user = this.$store.state.user; this.user = this.$store.state.user;
@ -361,8 +368,17 @@ export default {
this.iniSearchData(); this.iniSearchData();
this.getTableData(); this.getTableData();
await nextTick(100);
this.computeSearchHeight();
}, },
methods: { methods: {
computeSearchHeight() {
this.ref_search_height = this.$refs["ref_search"].clientHeight;
console.log(this.$refs["ref_search"]);
console.log(this.ref_search_height);
},
iniSearchData() { iniSearchData() {
const { searchParams } = this; const { searchParams } = this;
searchParams.forEach((item, index) => { searchParams.forEach((item, index) => {

2
src/views/modules/shequzhili/csgltc/csgl.vue
View File

@ -568,7 +568,7 @@ export default {
computed: { computed: {
tableHeight () { tableHeight () {
return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430 return this.$store.state.inIframe ? this.clientHeight - 350 + this.iframeHeight : this.clientHeight - 350
}, },

44
src/views/modules/shequzhili/csgltc/csglDetail.vue
View File

@ -11,7 +11,7 @@
prop="name" prop="name"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<span class="detail_span">{{formData.name}}</span> <span>{{formData.name}}</span>
</el-form-item> </el-form-item>
<el-form-item label="场所类别：" <el-form-item label="场所类别："
@ -19,51 +19,32 @@
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<span class="detail_span">{{formData.categoryName}}</span> <span>{{formData.categoryName}}</span>
</el-form-item> </el-form-item>
<el-form-item label="占地面积：" <el-form-item label="占地面积："
prop="areaCovered" prop="areaCovered"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<span class="detail_span">{{formData.areaCovered}}</span> <span>{{formData.areaCovered}}</span>
</el-form-item> </el-form-item>
<el-form-item label="容纳人数：" <el-form-item label="容纳人数："
prop="capacity" prop="capacity"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<span class="detail_span">{{formData.capacity}}</span> <span>{{formData.capacity}}</span>
</el-form-item> </el-form-item>
<el-form-item label="地址：" <el-form-item label="地址："
style="display: block" style="display: block"
prop="address" prop="address"
label-width="150px"> label-width="150px">
<span class="detail_span">{{formData.address}}</span> <div class="item_width_1">
</el-form-item> <span>{{formData.address}}</span>
<el-form-item label="位置坐标" <div id="app" class="div_map"></div>
prop="longitude"
label-width="150px"
style="display: block">
<div style="width: 500px">
<div id="app"
class="div_map"></div>
<div style="margin-top: 10px">
<span>经度</span>
<el-input class="item_width_3"
maxlength="50"
placeholder="请输入经度"
v-model="formData.longitude">
</el-input>
<span style="margin-left: 20px">纬度</span>
<el-input class="item_width_3"
maxlength="50"
placeholder="请输入纬度"
v-model="formData.latitude">
</el-input>
</div>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -118,7 +99,14 @@ export default {
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义 // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap () { initMap () {
// 定义地图中心点坐标 // 定义地图中心点坐标
var center = new window.TMap.LatLng(36.0722275, 120.38945519) let { latitude, longitude } = this.$store.state.user;
console.log('lat'+latitude+',lon'+longitude)
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
}
// 定义地图中心点坐标
var center = new window.TMap.LatLng(latitude, longitude);
// 定义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, // 设置地图中心点坐标

17
src/views/modules/shequzhili/csgltc/csglForm.vue
View File

@ -209,11 +209,13 @@ export default {
data : this.cityManagement data : this.cityManagement
} }
this.formData = { ...data } this.formData = { ...data }
let { latitude, longitude } = this.$store.state.user; // let { latitude, longitude } = this.$store.state.user;
const lat = this.formData.latitude === null || this.formData.latitude === '' ? latitude : this.formData.latitude; // const lat = this.formData.latitude === null || this.formData.latitude === '' ? latitude : this.formData.latitude;
const lon = this.formData.longitude === null || this.formData.longitude === '' ? longitude : this.formData.longitude; // const lon = this.formData.longitude === null || this.formData.longitude === '' ? longitude : this.formData.longitude;
map.setCenter(new TMap.LatLng(lat,lon)) if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== ''){
this.setMarker(lat,lon) map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
this.setMarker(this.formData.latitude, this.formData.longitude)
}
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
@ -301,7 +303,7 @@ export default {
map.on('panend', () => { map.on('panend', () => {
this.handleMoveCenter() this.handleMoveCenter()
}) })
this.handleMoveCenter() // this.handleMoveCenter()
this.convert() this.convert()
}, },
@ -381,7 +383,8 @@ export default {
geocoder geocoder
.getAddress({ location: location }) // 将给定的坐标位置转换为地址 .getAddress({ location: location }) // 将给定的坐标位置转换为地址
.then((result) => { .then((result) => {
this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address // this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address
this.formData.address = this.formData.address !== '' && this.formData.address !== null && (this.formData.longitude === '' || this.formData.longitude === null) ? this.formData.address : result.result.address
// 显示搜索到的地址 // 显示搜索到的地址
}); });
}, },

4
src/views/modules/shequzhili/ggfwtc/ggfw.vue
View File

@ -604,7 +604,7 @@ export default {
computed: { computed: {
tableHeight () { tableHeight () {
return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430 return this.$store.state.inIframe ? this.clientHeight - 350 + this.iframeHeight : this.clientHeight - 350
}, },
@ -644,7 +644,7 @@ export default {
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
border-radius: 4px; border-radius: 4px;
margin-top: 15px; margin-top: 15px;
padding: 23px 30px 10px; // padding: 23px 30px 10px;
.table { .table {
margin-top: 20px; margin-top: 20px;

34
src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
View File

@ -11,7 +11,7 @@
prop="name" prop="name"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<span class="detail_span">{{formData.name}}</span> <span>{{formData.name}}</span>
</el-form-item> </el-form-item>
<el-form-item label="场所类别：" <el-form-item label="场所类别："
@ -19,49 +19,29 @@
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<span class="detail_span">{{formData.categoryName}}</span> <span>{{formData.categoryName}}</span>
</el-form-item> </el-form-item>
<el-form-item label="占地面积：" <el-form-item label="占地面积："
prop="areaCovered" prop="areaCovered"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<span class="detail_span">{{formData.areaCovered}}</span> <span>{{formData.areaCovered}}</span>
</el-form-item> </el-form-item>
<el-form-item label="容纳人数：" <el-form-item label="容纳人数："
prop="capacity" prop="capacity"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<span class="detail_span">{{formData.capacity}}</span> <span>{{formData.capacity}}</span>
</el-form-item> </el-form-item>
<el-form-item label="地址：" <el-form-item label="地址："
style="display: block" style="display: block"
prop="address" prop="address"
label-width="150px"> label-width="150px">
<span class="detail_span">{{formData.address}}</span> <div class="item_width_1">
</el-form-item> <span>{{formData.address}}</span>
<el-form-item label="位置坐标" <div id="app" class="div_map"></div>
prop="longitude"
label-width="150px"
style="display: block">
<div style="width: 500px">
<div id="app"
class="div_map"></div>
<div style="margin-top: 10px">
<span>经度</span>
<el-input class="item_width_3"
maxlength="50"
placeholder="请输入经度"
v-model="formData.longitude">
</el-input>
<span style="margin-left: 20px">纬度</span>
<el-input class="item_width_3"
maxlength="50"
placeholder="请输入纬度"
v-model="formData.latitude">
</el-input>
</div>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>

18
src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
View File

@ -190,11 +190,13 @@
} }
this.formData = { ...data } this.formData = { ...data }
let { latitude, longitude } = this.$store.state.user; // let { latitude, longitude } = this.$store.state.user;
const lat = this.formData.latitude === null || this.formData.latitude === '' ? latitude : this.formData.latitude; // const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude;
const lon = this.formData.longitude === null || this.formData.longitude === '' ? longitude : this.formData.longitude; // const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude;
map.setCenter(new TMap.LatLng(lat, lon)) if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== ''){
this.setMarker(lat, lon) map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
this.setMarker(this.formData.latitude, this.formData.longitude)
}
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
@ -281,7 +283,7 @@
map.on('panend', () => { map.on('panend', () => {
this.handleMoveCenter() this.handleMoveCenter()
}) })
this.handleMoveCenter() // this.handleMoveCenter()
this.convert() this.convert()
}, },
@ -361,7 +363,9 @@
geocoder geocoder
.getAddress({ location: location }) // 将给定的坐标位置转换为地址 .getAddress({ location: location }) // 将给定的坐标位置转换为地址
.then((result) => { .then((result) => {
this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address console.log(this.formData)
// this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address
this.formData.address = this.formData.address !== '' && this.formData.address !== null && (this.formData.longitude === '' || this.formData.longitude === null) ? this.formData.address : result.result.address
// 显示搜索到的地址 // 显示搜索到的地址
}); });
}, },

16
src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
View File

@ -7,11 +7,14 @@
:addUrl="addUrl" :addUrl="addUrl"
:editUrl="editUrl" :editUrl="editUrl"
:delUrl="delUrl" :delUrl="delUrl"
:editAuth="editAuth"
:delAuth="delAuth"
:infoUrl="infoUrl" :infoUrl="infoUrl"
:exportUrl="exportUrl" :exportUrl="exportUrl"
:importUrl="importUrl" :importUrl="importUrl"
:mubanUrl="mubanUrl" :mubanUrl="mubanUrl"
:editParams="editParams" :editParams="editParams"
:editElseRules="editElseRules"
:editBtnName="(item) => (!item.latitude ? '待完善' : '修改')" :editBtnName="(item) => (!item.latitude ? '待完善' : '修改')"
idName="icDangerousChemicalsId" idName="icDangerousChemicalsId"
></base-page> ></base-page>
@ -68,6 +71,12 @@ export default {
editUrl: "/gov/org/icDangerousChemicals/edit", editUrl: "/gov/org/icDangerousChemicals/edit",
infoUrl: "/gov/org/icDangerousChemicals/detail", infoUrl: "/gov/org/icDangerousChemicals/detail",
delUrl: "/gov/org/icDangerousChemicals/del", delUrl: "/gov/org/icDangerousChemicals/del",
editAuth(item) {
return item.agencyId == this.$store.state.user.agencyId;
},
delAuth(item) {
return item.agencyId == this.$store.state.user.agencyId;
},
editParams: [ editParams: [
{ {
@ -148,6 +157,13 @@ export default {
}, },
{ field: "备注", keyName: "remark", type: "textarea" }, { field: "备注", keyName: "remark", type: "textarea" },
], ],
editElseRules: {
longitude: {
type: "number",
required: true,
message: "请拖动地图选择坐标点",
},
},
}; };
}, },
components: { basePage }, components: { basePage },

8
src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
View File

@ -14,6 +14,7 @@
:importUrl="importUrl" :importUrl="importUrl"
:mubanUrl="mubanUrl" :mubanUrl="mubanUrl"
:editParams="editParams" :editParams="editParams"
:editElseRules="editElseRules"
:editFixedParams="editFixedParams" :editFixedParams="editFixedParams"
:editParamsDiv="5" :editParamsDiv="5"
:editBtnName="(item) => (!item.latitude ? '待完善' : '修改')" :editBtnName="(item) => (!item.latitude ? '待完善' : '修改')"
@ -228,6 +229,13 @@ export default {
editFixedParams: { editFixedParams: {
agencyId: this.$store.state.user.agencyId, agencyId: this.$store.state.user.agencyId,
}, },
editElseRules: {
longitude: {
type: "number",
required: true,
message: "请拖动地图选择坐标点",
},
},
}; };
}, },
computed: {}, computed: {},

16
src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
View File

@ -7,11 +7,14 @@
:addUrl="addUrl" :addUrl="addUrl"
:editUrl="editUrl" :editUrl="editUrl"
:delUrl="delUrl" :delUrl="delUrl"
:editAuth="editAuth"
:delAuth="delAuth"
:infoUrl="infoUrl" :infoUrl="infoUrl"
:exportUrl="exportUrl" :exportUrl="exportUrl"
:importUrl="importUrl" :importUrl="importUrl"
:mubanUrl="mubanUrl" :mubanUrl="mubanUrl"
:editParams="editParams" :editParams="editParams"
:editElseRules="editElseRules"
:editBtnName="(item) => (!item.latitude ? '待完善' : '修改')" :editBtnName="(item) => (!item.latitude ? '待完善' : '修改')"
idName="icSuperiorResourceId" idName="icSuperiorResourceId"
></base-page> ></base-page>
@ -55,6 +58,12 @@ export default {
editUrl: "/gov/org/icSuperiorResource/edit", editUrl: "/gov/org/icSuperiorResource/edit",
infoUrl: "/gov/org/icSuperiorResource/detail", infoUrl: "/gov/org/icSuperiorResource/detail",
delUrl: "/gov/org/icSuperiorResource/del", delUrl: "/gov/org/icSuperiorResource/del",
editAuth(item) {
return item.agencyId == this.$store.state.user.agencyId;
},
delAuth(item) {
return item.agencyId == this.$store.state.user.agencyId;
},
editParams: [ editParams: [
{ {
@ -119,6 +128,13 @@ export default {
], ],
}, },
], ],
editElseRules: {
longitude: {
type: "number",
required: true,
message: "请拖动地图选择坐标点",
},
},
}; };
}, },
components: { basePage }, components: { basePage },

153
src/views/modules/shequzhili/tuceng/zhonghe/base.vue
View File

@ -9,7 +9,19 @@
class="demo-form-inline" class="demo-form-inline"
> >
<div> <div>
<el-form-item prop="gridId" label="所属网格"> <el-form-item prop="gridId" label="所属组织">
<div class="resi-cell-value">
<el-cascader class="customer_cascader"
ref="myCascader"
clearable
v-model="agencyIdArray"
:options="orgOptions"
:props="orgOptionProps"
:show-all-levels="false"
@change="handleChangeAgency"></el-cascader>
</div>
</el-form-item>
<!-- <el-form-item prop="gridId" label="所属网格">
<div class="resi-cell-value"> <div class="resi-cell-value">
<el-select <el-select
v-model.trim="fmData.gridId" v-model.trim="fmData.gridId"
@ -28,7 +40,8 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
</el-form-item> </el-form-item> -->
<el-form-item label="所属房屋"> <el-form-item label="所属房屋">
<div class="resi-cell-value"> <div class="resi-cell-value">
<div class="resi-cell-col"> <div class="resi-cell-col">
@ -194,7 +207,7 @@
<el-table-column <el-table-column
prop="HOME_ID" prop="HOME_ID"
label="所属家庭" label="所属房屋"
align="center" align="center"
min-width="160" min-width="160"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
@ -212,7 +225,7 @@
prop="MOBILE" prop="MOBILE"
width="140" width="140"
align="center" align="center"
label="手机号" label="手机"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
</el-table-column> </el-table-column>
@ -331,6 +344,15 @@ export default {
optionsH: [], optionsH: [],
optionsD: [], optionsD: [],
optionsG: [], optionsG: [],
orgOptions: [],
orgOptionProps:{
multiple: false,
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
},
agencyIdArray:[],
optionsWelfare: [ optionsWelfare: [
{ {
@ -344,6 +366,7 @@ export default {
], ],
fmData: { fmData: {
agencyId:"",
gridId: "", gridId: "",
villageId: "", villageId: "",
buildId: "", buildId: "",
@ -410,6 +433,7 @@ export default {
}, },
}, },
mounted() { mounted() {
this.getOrgTreeList();
this.getGridList(); this.getGridList();
this.getValiheList(); this.getValiheList();
this.getTableData(); this.getTableData();
@ -465,6 +489,24 @@ export default {
this.getHouseList(); this.getHouseList();
}, },
getOrgTreeList() {
const { user } = this.$store.state
this.$http
.post('/gov/org/customeragency/agencygridtree', {})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取组织树成功', res.data)
this.orgOptions=[]
this.orgOptions .push( res.data)
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
getGridList() { getGridList() {
const { user } = this.$store.state; const { user } = this.$store.state;
this.$http this.$http
@ -489,7 +531,7 @@ export default {
this.$http this.$http
.post("/gov/org/icneighborhood/neighborhoodoption", { .post("/gov/org/icneighborhood/neighborhoodoption", {
gridId: this.fmData.gridId, gridId: this.fmData.gridId,
agencyId: "", agencyId: this.fmData.agencyId,
// agencyId: user.agencyId // agencyId: user.agencyId
}) })
.then(({ data: res }) => { .then(({ data: res }) => {
@ -579,62 +621,125 @@ export default {
this.handleSearch(); this.handleSearch();
}, },
handleChangeAgency(val) {
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
if (obj) {
if(obj.level === 'grid'){
this.fmData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.fmData.agencyId=''
}else{
this.fmData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.fmData.gridId = ''
}
}else{
this.fmData.agencyId=''
this.fmData.gridId = ''
}
this.fmData.villageId = ''
this.fmData.buildId = ''
this.fmData.unitId = ''
this.fmData.homeId = ''
this.getValiheList()
},
computeQueryParams() { computeQueryParams() {
const { pageSize, pageNo, elseParams, fmData } = this; const { pageSize, pageNo, elseParams, fmData } = this;
let conditions=[]
if(fmData.agencyId){
conditions.push({
queryType: "like",
tableName: "ic_resi_user",
columnName: "AGENCY_ID",
columnValue: [fmData.agencyId],
},)
}
return { if(fmData.gridId){
formCode: "resi_base_info", conditions.push(
pageSize,
pageNo,
conditions: [
{ {
queryType: "equal", queryType: "equal",
tableName: "ic_resi_user", tableName: "ic_resi_user",
columnName: "GRID_ID", columnName: "GRID_ID",
columnValue: [fmData.gridId], columnValue: [fmData.gridId],
}, }
)
}
if(fmData.villageId){
conditions.push(
{ {
queryType: "equal", queryType: "equal",
tableName: "ic_resi_user", tableName: "ic_resi_user",
columnName: "VILLAGE_ID", columnName: "VILLAGE_ID",
columnValue: [fmData.villageId], columnValue: [fmData.villageId],
}, }
{ )
}
if(fmData.buildId){
conditions.push({
queryType: "equal", queryType: "equal",
tableName: "ic_resi_user", tableName: "ic_resi_user",
columnName: "BUILD_ID", columnName: "BUILD_ID",
columnValue: [fmData.buildId], columnValue: [fmData.buildId],
}, })
{ }
if(fmData.unitId){
conditions.push({
queryType: "equal", queryType: "equal",
tableName: "ic_resi_user", tableName: "ic_resi_user",
columnName: "UNIT_ID", columnName: "UNIT_ID",
columnValue: [fmData.unitId], columnValue: [fmData.unitId],
}, })
{ }
if(fmData.homeId){
conditions.push({
queryType: "equal", queryType: "equal",
tableName: "ic_resi_user", tableName: "ic_resi_user",
columnName: "HOME_ID", columnName: "HOME_ID",
columnValue: [fmData.homeId], columnValue: [fmData.homeId],
}, })
{ }
if(fmData.name){
conditions.push({
queryType: "like", queryType: "like",
tableName: "ic_resi_user", tableName: "ic_resi_user",
columnName: "NAME", columnName: "NAME",
columnValue: [fmData.name], columnValue: [fmData.name],
}, })
{ }
if(fmData.mobile){
conditions.push({
queryType: "like", queryType: "like",
tableName: "ic_resi_user", tableName: "ic_resi_user",
columnName: "MOBILE", columnName: "MOBILE",
columnValue: [fmData.mobile], columnValue: [fmData.mobile],
}, })
{ }
if(fmData.idCard){
conditions.push({
queryType: "like", queryType: "like",
tableName: "ic_resi_user", tableName: "ic_resi_user",
columnName: "ID_CARD", columnName: "ID_CARD",
columnValue: [fmData.idCard], columnValue: [fmData.idCard],
}, })
}
return {
formCode: "resi_base_info",
pageSize,
pageNo,
conditions: [
...conditions,
...elseParams, ...elseParams,
], ],
}; };

9
src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
View File

@ -305,7 +305,7 @@
</div> </div>
</div> </div>
<div v-show="selPlaceType==='enterprise_partrol'"> <div v-show="selPlaceType==='enterprise_patrol'">
<div class="popTitle">企事业信息</div> <div class="popTitle">企事业信息</div>
<div class="popContentTitle">场所类型： <div class="popContentTitle">场所类型：
<span>{{ selInfo.placeTypeName }}</span> <span>{{ selInfo.placeTypeName }}</span>
@ -782,10 +782,11 @@ const vueGis = {
this.loadGroupRent(info) this.loadGroupRent(info)
} }
if (info.placeType === 'party_unit') {//来自联建单位的机关直属部门 if (info.placeType === 'party_unit') {//来自联建单位的机关直属部门
this.loadPartyUnit(info) this.loadPartyUnit(info)
} }
if (info.placeType === 'enterprise_partrol') {//来自企事业查询的 if (info.placeType === 'enterprise_patrol') {//来自企事业查询的
this.loadEnterprisePartrol(info) this.loadEnterprisePartrol(info)
} }
@ -1009,10 +1010,10 @@ const vueGis = {
}, },
async loadEnterprisePartrol (info) { async loadEnterprisePartrol (info) {
const url = "/gov/org/enterprise/detail" const url = "/gov/org/enterprise/detail/" + info.id
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail" // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail"
const { data, code, msg } = await requestGet(url) const { data, code, msg } = await requestPost(url)
if (code === 0) { if (code === 0) {
// debugger // debugger

Write Preview
Loading…
Cancel
Save