Browse Source

Merge branch 'dev-tuceng0616' into dev

test
zxc 3 years ago
parent
commit
09bb356019
  1. 3
      src/views/components/resiSearch.vue
  2. 3
      src/views/modules/communityParty/regionalParty/activitys.vue
  3. 2
      src/views/modules/communityParty/regionalParty/activitysForm.vue
  4. 7
      src/views/modules/communityService/dqfwzx/cpts/edit.vue
  5. 7
      src/views/modules/communityService/sqzzz/cpts/edit.vue
  6. 19
      src/views/modules/cpts/base/cpts/edit.vue
  7. 78
      src/views/modules/shequzhili/csgltc/csglForm.vue
  8. 77
      src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
  9. 21
      src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
  10. 17
      src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
  11. 6
      src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
  12. 7
      src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
  13. 9
      src/views/modules/shequzhili/tuceng/zhonghe/base.vue
  14. 0
      src/views/modules/shequzhili/tuceng/zhonghe/xidurenyuan.vue

3
src/views/components/resiSearch.vue

@ -462,10 +462,11 @@ export default {
else this.form[n] = ''
}
this. agencyIdArray=[]
// let arr3 = [...arr1, ...arr]
this.$emit('search', [])
// this.handleSearch()
this.orgOptions = [];
// this.orgOptions = [];
},
handleSearch() {
// console.log('formmmmm---', this.form)

3
src/views/modules/communityParty/regionalParty/activitys.vue

@ -223,7 +223,6 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
:destroy-on-close="true"
width="950px"
top="5vh"
class="dialog-h"
@ -429,6 +428,7 @@ export default {
diaClose () {
this.$refs.ref_form.resetData()
this.formShow = false
},
@ -449,6 +449,7 @@ export default {
handleAdd () {
this.formTitle = '新增'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('add', null)

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

@ -258,7 +258,7 @@ export default {
latitude: 120.38945519 //
},
serviceList: [],
gridList: [],
// gridList: [],
agencyId: ''
}

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

@ -438,8 +438,13 @@ export default {
},
// init
initMap() {
let { latitude, longitude } = this.$store.state.user;
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
}
//
var center = new window.TMap.LatLng(36.0722275, 120.38945519);
var center = new window.TMap.LatLng(latitude, longitude);
// map TMap.Map()
map = new window.TMap.Map(document.getElementById("app"), {
center: center, //

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

@ -391,8 +391,13 @@ export default {
},
// init
initMap() {
let { latitude, longitude } = this.$store.state.user;
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
}
//
var center = new window.TMap.LatLng(36.0722275, 120.38945519);
var center = new window.TMap.LatLng(latitude, longitude);
// map TMap.Map()
map = new window.TMap.Map(document.getElementById("app"), {
center: center, //

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

@ -68,8 +68,8 @@
class="item-number"
size="small"
clearable
show-word-limit
:rows="3"
:precision="item.precision || 0"
:step="item.step || 1"
:min="item.min || 0"
:max="item.max || 999999999999"
:placeholder="item.placeholder || '请输入'"
@ -100,10 +100,10 @@
<div class="address-item">
<el-input
class="address-item-input"
maxlength="100"
show-word-limit
:placeholder="item.placeholder || '请输入所在地址'"
v-model="fmData[item.keyName]"
:maxlength="item.maxlength || ''"
show-word-limit
>
</el-input>
<el-button
@ -195,8 +195,8 @@
class="item-number"
size="small"
clearable
show-word-limit
:rows="3"
:precision="item.precision || 0"
:step="item.step || 1"
:min="item.min || 0"
:max="item.max || 999999999999"
:placeholder="item.placeholder || '请输入'"
@ -227,10 +227,10 @@
<div class="address-item">
<el-input
class="address-item-input"
maxlength="100"
show-word-limit
:placeholder="item.placeholder || '请输入所在地址'"
v-model="fmData[item.keyName]"
:maxlength="item.maxlength || ''"
show-word-limit
>
</el-input>
<el-button
@ -299,7 +299,6 @@
</template>
<script>
import { mapGetters } from "vuex";
import { requestPost } from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick";
@ -670,7 +669,7 @@ export default {
width: 225px;
}
.item-number {
width: 125px;
width: 225px;
}
.address-item {

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

@ -65,7 +65,7 @@
:precision="2"
:step="0.01"
:min="0"
:max="9999"
:max="9600000"
label="占地面积"></el-input-number>
</el-form-item>
<el-form-item label="容纳人数"
@ -82,51 +82,18 @@
prop="address"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder="请输入地址名称"
<div class="item_width_1">
<el-input
style="width:420px"
:placeholder="'请输入所在地址'"
v-model="formData.address">
</el-input>
</el-form-item>
<el-form-item label="位置坐标"
prop="longitude"
label-width="150px"
style="display: block">
<div style="width:500px">
<div class="div_map">
<div id="app">
</div>
<div class="div_searchmap">
<el-input class="item_width_4"
maxlength="50"
size="mini"
placeholder="请输入关键字"
v-model="keyWords">
</el-input>
<el-button style="margin-left: 10px"
type="primary"
size="mini"
@click="handleSearchMap">查询</el-button>
</div>
</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>
</el-input>
<el-button
style="margin-left: 10px"
type="default"
size="small"
@click="handleSearchMap">查询</el-button>
<div id="app" class="div_map"></div>
</div>
</el-form-item>
</el-form>
@ -201,8 +168,8 @@ export default {
this.formData.icCityManagementId = icCityManagementId
await this.loadFormData()
} else {
map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
this.setMarker(36.0722275, 120.38945519)
// map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
// this.setMarker(36.0722275, 120.38945519)
}
this.endLoading()
@ -242,8 +209,9 @@ export default {
data : this.cityManagement
}
this.formData = { ...data }
const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude;
const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude;
let { latitude, longitude } = this.$store.state.user;
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;
map.setCenter(new TMap.LatLng(lat,lon))
this.setMarker(lat,lon)
} else {
@ -302,7 +270,15 @@ export default {
// init
initMap () {
//
var center = new window.TMap.LatLng(36.52799, 120.7553)
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);
// var center = new window.TMap.LatLng(36.52799, 120.7553)
// map TMap.Map()
map = new window.TMap.Map(document.getElementById('app'), {
center: center, //
@ -352,7 +328,7 @@ export default {
//
search
.searchRectangle({
keyword: this.keyWords,
keyword: this.formData.address,
bounds: map.getBounds()
})
.then((result) => {

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

@ -47,7 +47,7 @@
:precision="2"
:step="0.01"
:min="0"
:max="9999"
:max="9600000"
label="占地面积"></el-input-number>
</el-form-item>
<el-form-item label="容纳人数"
@ -64,48 +64,18 @@
prop="address"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
<div class="item_width_1">
<el-input
style="width:420px"
:placeholder="'请输入所在地址'"
v-model="formData.address">
</el-input>
</el-form-item>
<el-form-item label="位置坐标"
prop="longitude"
label-width="150px"
style="display: block">
<div style="width:500px">
<div class="div_map">
<div id="app">
</div>
<div class="div_searchmap">
<el-input class="item_width_4"
maxlength="50"
size="mini"
placeholder="请输入关键字"
v-model="keyWords">
</el-input>
<el-button style="margin-left: 10px"
type="primary"
size="mini"
@click="handleSearchMap">查询</el-button>
</div>
</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>
</el-input>
<el-button
style="margin-left: 10px"
type="default"
size="small"
@click="handleSearchMap">查询</el-button>
<div id="app" class="div_map"></div>
</div>
</el-form-item>
</el-form>
@ -179,8 +149,8 @@
this.formData.icPublicServiceId = icPublicServiceId
await this.loadFormData()
} else {
map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
this.setMarker(36.0722275, 120.38945519)
// map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
// this.setMarker(36.0722275, 120.38945519)
}
this.endLoading()
@ -220,8 +190,9 @@
}
this.formData = { ...data }
const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude;
const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude;
let { latitude, longitude } = this.$store.state.user;
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;
map.setCenter(new TMap.LatLng(lat, lon))
this.setMarker(lat, lon)
} else {
@ -280,8 +251,14 @@
// init
initMap () {
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(36.0722275, 120.38945519)
var center = new window.TMap.LatLng(latitude, longitude);
// map TMap.Map()
map = new window.TMap.Map(document.getElementById('app'), {
center: center, //
@ -331,7 +308,7 @@
//
search
.searchRectangle({
keyword: this.keyWords,
keyword: this.formData.address,
bounds: map.getBounds()
})
.then((result) => {
@ -432,12 +409,12 @@
address: [
{ required: true, message: '地址不能为空', trigger: 'blur' }
],
longitude: [
/*longitude: [
{ required: true, message: '坐标不能为空', trigger: 'blur' }
],
latitude: [
{ required: true, message: '坐标不能为空', trigger: 'blur' }
]
]*/
}
},

21
src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue

@ -12,7 +12,7 @@
:importUrl="importUrl"
:mubanUrl="mubanUrl"
:editParams="editParams"
:editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')"
:editBtnName="(item) => (!item.latitude ? '待完善' : '修改')"
idName="icDangerousChemicalsId"
></base-page>
</div>
@ -74,7 +74,7 @@ export default {
field: "企业名称",
keyName: "name",
type: "input",
maxlength: 100,
maxlength: 50,
editDisabled: true,
rules: [
{
@ -102,6 +102,8 @@ export default {
field: "周边安全间距",
keyName: "safeDistance",
type: "number",
precision: 2,
step: 0.01,
min: 0,
max: 1000000000,
unitName: "公里",
@ -117,12 +119,23 @@ export default {
optionList: [],
editDisabled: true,
},
{ field: "负责人", keyName: "principalName", type: "input" },
{ field: "联系电话", keyName: "principalMobile", type: "input" },
{
field: "负责人",
keyName: "principalName",
type: "input",
maxlength: 50,
},
{
field: "联系电话",
keyName: "principalMobile",
type: "input",
maxlength: 50,
},
{
field: "经营地址",
keyName: "address",
type: "address",
maxlength: 50,
supKeys: ["longitude", "latitude"],
supValues: ["", ""],
rules: [

17
src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue

@ -15,8 +15,6 @@
row-key="id"
border
style="width: 100%"
class="resi-table"
height="400px"
:header-cell-style="getRowClass"
>
<el-table-column label="序号" type="index" align="center" width="50">
@ -192,7 +190,13 @@
</template>
</el-table-column>
<el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
<el-table-column
v-if="!disabled"
fixed="right"
label="操作"
align="center"
width="120"
>
<template slot-scope="scope">
<template v-if="scope.row.isEdit">
<el-button
@ -355,10 +359,9 @@ export default {
handleImgRemove(file, row) {
console.log("handleImgRemove", file);
if (file.response) {
row.imgList = row.imgList.map(
(item) => item !== file.response.data.url
);
let url = file.url || file.response.data.url;
if (url) {
row.imgList = row.imgList.filter((item) => item !== url);
this.computeImgShowList(row);
}
},

6
src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue

@ -16,7 +16,7 @@
:editParams="editParams"
:editFixedParams="editFixedParams"
:editParamsDiv="5"
:editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')"
:editBtnName="(item) => (!item.latitude ? '待完善' : '修改')"
:formBtnFixed="false"
idName="enterpriseId"
>
@ -155,7 +155,7 @@ export default {
field: "场所名称",
keyName: "placeOrgName",
type: "input",
maxlength: 100,
maxlength: 50,
editDisabled: true,
rules: [
{
@ -199,6 +199,7 @@ export default {
{
field: "联系电话",
keyName: "mobile",
maxlength: 50,
type: "input",
rules: [
{
@ -212,6 +213,7 @@ export default {
field: "场所地址",
keyName: "address",
type: "address",
maxlength: 50,
supKeys: ["longitude", "latitude"],
supValues: ["", ""],
rules: [

7
src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue

@ -12,7 +12,7 @@
:importUrl="importUrl"
:mubanUrl="mubanUrl"
:editParams="editParams"
:editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')"
:editBtnName="(item) => (!item.latitude ? '待完善' : '修改')"
idName="icSuperiorResourceId"
></base-page>
</div>
@ -61,7 +61,7 @@ export default {
field: "场所名称",
keyName: "name",
type: "input",
maxlength: 100,
maxlength: 50,
editDisabled: true,
rules: [
{
@ -91,6 +91,8 @@ export default {
type: "number",
min: 0,
max: 1000000000,
precision: 2,
step: 0.01,
unitName: "平方公里",
},
{
@ -105,6 +107,7 @@ export default {
field: "位置坐标",
keyName: "address",
type: "address",
maxlength: 50,
supKeys: ["longitude", "latitude"],
supValues: ["", ""],
rules: [

9
src/views/modules/shequzhili/tuceng/zhonghe/base.vue

@ -580,12 +580,12 @@ export default {
},
computeQueryParams() {
const { elseParams, fmData } = this;
const { pageSize, pageNo, elseParams, fmData } = this;
return {
formCode: "resi_base_info",
pageNo: 1,
pageSize: 20,
pageSize,
pageNo,
conditions: [
{
queryType: "equal",
@ -671,10 +671,7 @@ export default {
async getTableData() {
const url = "/epmetuser/icresiuser/listresi";
const { pageSize, pageNo, fmData } = this;
const { data, code, msg } = await requestPost(url, {
pageSize,
pageNo,
...this.computeQueryParams(),
});
if (code === 0) {

0
src/views/modules/shequzhili/tuceng/zhonghe/xidurenyuanvue.vue → src/views/modules/shequzhili/tuceng/zhonghe/xidurenyuan.vue

Loading…
Cancel
Save