elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev-tuceng0616' into dev

feature
jiangyy 3 years ago
parent
a82f146fc1 4e03fcceb3
commit
60fa0dcaa8
10 changed files with 304 additions and 192 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. 20
      src/views/modules/communityService/ninePlaces/places/places.vue
  2. 28
      src/views/modules/communityService/ninePlaces/places/placesForm.vue
  3. 379
      src/views/modules/communityService/sqzzz/index.vue
  4. 33
      src/views/modules/cpts/base/cpts/edit.vue
  5. 9
      src/views/modules/cpts/base/index.vue
  6. 1
      src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
  7. 3
      src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
  8. 10
      src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
  9. 1
      src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
  10. 12
      src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

20
src/views/modules/communityService/ninePlaces/places/places.vue
View File

@ -148,12 +148,16 @@
class="operate"> class="operate">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text"
class="div-table-button--detail"
size="small"
@click="handleDetail(scope.row)">查看</el-button>
<el-button v-if="agencyId===scope.row.agencyId" type="text"
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
<el-button type="text" <el-button v-if="agencyId===scope.row.agencyId" type="text"
class="div-table-button--delete" class="div-table-button--delete"
size="small" size="small"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
@ -182,7 +186,7 @@
class="dialog-h" class="dialog-h"
@closed="diaClose"> @closed="diaClose">
<places-form ref="ref_form" <places-form ref="ref_form"
:gridList="gridList" :agencyId="agencyId"
:scaleList="scaleList" :scaleList="scaleList"
:placeTypeList="placeTypeList" :placeTypeList="placeTypeList"
@dialogCancle="addFormCancle" @dialogCancle="addFormCancle"
@ -262,7 +266,8 @@ export default {
const url = "/gov/org/customergrid/gridoption" const url = "/gov/org/customergrid/gridoption"
let params = { let params = {
agencyId: this.agencyId agencyId: this.agencyId,
purpose:"query"
} }
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
@ -366,6 +371,13 @@ export default {
this.$refs.ref_form.initForm('edit', row.placeOrgId) this.$refs.ref_form.initForm('edit', row.placeOrgId)
}) })
}, },
handleDetail (row) {
this.formTitle = '详情'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('detail', row.placeOrgId)
})
},
addFormCancle () { addFormCancle () {
this.formShow = false this.formShow = false

28
src/views/modules/communityService/ninePlaces/places/placesForm.vue
View File

@ -148,6 +148,7 @@ export default {
async initForm (type, placeOrgId) { async initForm (type, placeOrgId) {
this.$refs.ref_form.resetFields(); this.$refs.ref_form.resetFields();
this.loadGrid()
this.formType = type this.formType = type
if (placeOrgId) { if (placeOrgId) {
@ -156,6 +157,25 @@ export default {
await this.loadFormData() await this.loadFormData()
} }
},
async loadGrid () {
const url = "/gov/org/customergrid/gridoption"
let params = {
agencyId: this.agencyId,
purpose:"addorupdate"
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.gridList = data
} else {
this.$message.error(msg)
}
}, },
//加载组织 //加载组织
@ -301,10 +321,6 @@ export default {
}, },
props: { props: {
gridList: {
type: Array,
default: []
},
scaleList: { scaleList: {
type: Array, type: Array,
default: [] default: []
@ -313,6 +329,10 @@ export default {
type: Array, type: Array,
default: [] default: []
}, },
agencyId: {
type: String,
default: ""
},
} }
} }
</script> </script>

379
src/views/modules/communityService/sqzzz/index.vue
View File

@ -1,135 +1,145 @@
<template> <template>
<div class="resi-container"> <div class="resi-container">
<el-card ref="searchCard" <el-card ref="searchCard" class="search-card">
class="search-card"> <el-form
<el-form ref="searchForm" ref="searchForm"
:inline="true" :inline="true"
:model="fmData" :model="fmData"
class="demo-form-inline"> class="demo-form-inline"
<el-form-item label="组织名称" >
prop="organizationName"> <el-form-item label="组织名称" prop="organizationName">
<el-input v-model="fmData.organizationName" <el-input
class="resi-cell-input" v-model="fmData.organizationName"
size="small" class="resi-cell-input"
clearable size="small"
placeholder="请输入"> clearable
placeholder="请输入"
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" <el-form-item label="创建时间" prop="createTime">
prop="createTime"> <el-date-picker
<el-date-picker v-model="fmData.createTime" v-model="fmData.createTime"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="备注" <el-form-item label="备注" prop="remark">
prop="remark"> <el-input
<el-input v-model="fmData.remark" v-model="fmData.remark"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入"> placeholder="请输入"
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button class="diy-button--search" <el-button
size="small" class="diy-button--search"
@click="handleSearch">查询</el-button> size="small"
<el-button class="diy-button--reset" @click="handleSearch"
size="small" >查询</el-button
@click="resetForm('searchForm')">重置</el-button> >
<el-button
class="diy-button--reset"
size="small"
@click="resetForm('searchForm')"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<el-card class="resi-card-table"> <el-card class="resi-card-table">
<div class="resi-row-btn"> <div class="resi-row-btn">
<el-button class="diy-button--add" <el-button class="diy-button--add" size="small" @click="handleAdd"
size="small" >新增</el-button
@click="handleAdd">新增</el-button> >
<el-button class="diy-button--export" <el-button
size="small" class="diy-button--export"
@click="handleExportModule('room')">下载模板</el-button> size="small"
<el-upload ref="upload" @click="handleExportModule('room')"
class="upload-btn" >下载模板</el-button
action="uploadUlr" >
:limit="1" <el-upload
:accept="'.xls,.xlsx'" ref="upload"
:with-credentials="true" class="upload-btn"
:show-file-list="false" action="uploadUlr"
:auto-upload="true" :limit="1"
:on-progress="handleProgress" :accept="'.xls,.xlsx'"
:on-success="handleExcelSuccess" :with-credentials="true"
:before-upload="beforeExcelUpload" :show-file-list="false"
:http-request="uploadHttpRequest"> :auto-upload="true"
<el-button size="small" :on-progress="handleProgress"
class="diy-button--delete" :on-success="handleExcelSuccess"
:loading="importLoading">{{ importBtnTitle }}</el-button> :before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest"
>
<el-button
size="small"
class="diy-button--delete"
:loading="importLoading"
>{{ importBtnTitle }}</el-button
>
</el-upload> </el-upload>
<el-button @click="handleChu" <el-button @click="handleChu" class="diy-button--reset" size="small"
class="diy-button--reset" >导出</el-button
size="small">导出</el-button> >
</div> </div>
<el-table :data="tableData" <el-table
border :data="tableData"
style="width: 100%" border
class="resi-table" style="width: 100%"
:height="maxTableHeight"> class="resi-table"
<el-table-column label="序号" :height="maxTableHeight"
type="index" >
align="center" <el-table-column label="序号" type="index" align="center" width="50" />
width="50" /> <el-table-column
<el-table-column prop="organizationName" prop="organizationName"
label="组织名称" label="组织名称"
align="center"> align="center"
>
<template slot-scope="scope"> <template slot-scope="scope">
<a class="name-a" <a class="name-a" @click="handleWatch(scope.$index)">
@click="handleWatch(scope.$index)">
{{ scope.row.organizationName }} {{ scope.row.organizationName }}
</a> </a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="categoryName" <el-table-column prop="categoryName" align="center" label="分类名称">
align="center"
label="分类名称">
</el-table-column> </el-table-column>
<el-table-column prop="organizationPersonCount" <el-table-column
align="center" prop="organizationPersonCount"
label="组织人数"> align="center"
label="组织人数"
>
</el-table-column> </el-table-column>
<el-table-column prop="serviceItem" <el-table-column
label="服务事项" prop="serviceItem"
align="center" label="服务事项"
:show-overflow-tooltip="true"> align="center"
:show-overflow-tooltip="true"
>
</el-table-column> </el-table-column>
<el-table-column prop="score" <el-table-column prop="score" width="100" align="center" label="积分">
width="100"
align="center"
label="积分">
</el-table-column> </el-table-column>
<el-table-column prop="principalName" <el-table-column prop="principalName" align="center" label="负责人">
align="center"
label="负责人">
</el-table-column> </el-table-column>
<el-table-column prop="principalPhone" <el-table-column prop="principalPhone" align="center" label="联系电话">
align="center"
label="联系电话">
</el-table-column> </el-table-column>
<el-table-column prop="remark" <el-table-column prop="remark" align="center" label="备注">
align="center"
label="备注">
</el-table-column> </el-table-column>
<el-table-column prop="organizationCreatedTime" <el-table-column
align="center" prop="organizationCreatedTime"
label="创建时间"> align="center"
label="创建时间"
>
</el-table-column> </el-table-column>
<el-table-column fixed="right" <el-table-column fixed="right" label="操作" align="center" width="160">
label="操作"
align="center"
width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button <!-- <el-button
@click="handleWatch(scope.$index)" @click="handleWatch(scope.$index)"
@ -137,64 +147,87 @@
size="small" size="small"
>查看</el-button >查看</el-button
> --> > -->
<el-button type="text" <el-button
class="div-table-button--detail" type="text"
size="small" class="div-table-button--detail"
@click="handleScore(scope.row)">积分记录</el-button> size="small"
@click="handleScore(scope.row)"
<el-button @click="handleEdit(scope.$index)" >积分记录</el-button
type="text" >
size="small"
class="div-table-button--edit">修改</el-button> <el-button
@click="handleEdit(scope.$index)"
<el-popconfirm title="删除之后无法回复，确认删除？" v-if="scope.row.agencyId == $store.state.user.agencyId"
@onConfirm="handleDel(scope.row, scope.$index)" type="text"
@confirm="handleDel(scope.row, scope.$index)"> size="small"
<el-button slot="reference" class="div-table-button--edit"
type="text" >修改</el-button
size="small" >
class="div-table-button--delete"
style="margin-left: 10px">删除</el-button> <el-popconfirm
title="删除之后无法回复，确认删除？"
v-if="scope.row.agencyId == $store.state.user.agencyId"
@onConfirm="handleDel(scope.row, scope.$index)"
@confirm="handleDel(scope.row, scope.$index)"
>
<el-button
slot="reference"
type="text"
size="small"
class="div-table-button--delete"
style="margin-left: 10px"
>删除</el-button
>
</el-popconfirm> </el-popconfirm>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div> <div>
<el-pagination @size-change="handleSizeChange" <el-pagination
@current-change="handleCurrentChange" @size-change="handleSizeChange"
:current-page.sync="pageNo" @current-change="handleCurrentChange"
:page-sizes="[20, 50, 100, 200]" :current-page.sync="pageNo"
:page-size="parseInt(pageSize)" :page-sizes="[20, 50, 100, 200]"
layout="sizes, prev, pager, next, total" :page-size="parseInt(pageSize)"
:total="total"> layout="sizes, prev, pager, next, total"
:total="total"
>
</el-pagination> </el-pagination>
</div> </div>
</el-card> </el-card>
<!-- 修改弹出框 --> <!-- 修改弹出框 -->
<el-dialog :visible.sync="formShow" <el-dialog
:close-on-click-modal="false" :visible.sync="formShow"
:close-on-press-escape="false" :close-on-click-modal="false"
:title="formTitle" :close-on-press-escape="false"
width="850px" :title="formTitle"
top="5vh" width="850px"
class="dialog-h" top="5vh"
@closed="handleClose"> class="dialog-h"
<edit-form ref="eleEditForm" @closed="handleClose"
@dialogCancle="handleClose" >
@dialogOk="handleEditSuccess"></edit-form> <edit-form
ref="eleEditForm"
@dialogCancle="handleClose"
@dialogOk="handleEditSuccess"
></edit-form>
</el-dialog> </el-dialog>
<!-- 积分记录 --> <!-- 积分记录 -->
<el-dialog :visible.sync="scoreDiaShow" <el-dialog
:close-on-click-modal="false" :visible.sync="scoreDiaShow"
:close-on-press-escape="false" :close-on-click-modal="false"
:title="scoreDiaTitle" :close-on-press-escape="false"
width="70%" :title="scoreDiaTitle"
top="5vh" width="70%"
@closed="diaClose"> top="5vh"
<score-record ref="ref_score" @closed="diaClose"
:serviceType="'community_org'"></score-record> >
<score-record
ref="ref_score"
:serviceType="'community_org'"
></score-record>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -209,7 +242,7 @@ import scoreRecord from "../../../components/scoreRecord.vue";
export default { export default {
components: { editForm, scoreRecord }, components: { editForm, scoreRecord },
data () { data() {
return { return {
openSearch: false, openSearch: false,
@ -239,7 +272,7 @@ export default {
}; };
}, },
computed: { computed: {
maxTableHeight () { maxTableHeight() {
return this.$store.state.inIframe return this.$store.state.inIframe
? this.clientHeight - 360 + this.iframeHeigh ? this.clientHeight - 360 + this.iframeHeigh
: this.clientHeight - 360; : this.clientHeight - 360;
@ -257,11 +290,11 @@ export default {
} }
}, },
}, },
mounted () { mounted() {
this.getTableData(); this.getTableData();
}, },
methods: { methods: {
async handleExportModule () { async handleExportModule() {
let url = "/heart/iccommunityselforganization/import-template-download"; let url = "/heart/iccommunityselforganization/import-template-download";
let params = {}; let params = {};
@ -298,18 +331,18 @@ export default {
}); });
}, },
// 上传大图标成功 // 上传大图标成功
handleExcelSuccess (res, file) { handleExcelSuccess(res, file) {
if (res.code === 0 && res.msg === "success") { if (res.code === 0 && res.msg === "success") {
console.log("resss---ppp", res); console.log("resss---ppp", res);
} else { } else {
this.$message.error(res.msg); this.$message.error(res.msg);
} }
}, },
handleProgress (event, file, fileList) { handleProgress(event, file, fileList) {
console.log("percentage", file.percentage); console.log("percentage", file.percentage);
}, },
beforeExcelUpload (file) { beforeExcelUpload(file) {
console.log("file", file); console.log("file", file);
const isType = file.type === "application/vnd.ms-excel"; const isType = file.type === "application/vnd.ms-excel";
const isTypeComputer = const isTypeComputer =
@ -326,7 +359,7 @@ export default {
} }
return fileType && isLt1M; return fileType && isLt1M;
}, },
async uploadHttpRequest (file) { async uploadHttpRequest(file) {
this.importLoading = true; this.importLoading = true;
this.importBtnTitle = "正在上传中..."; this.importBtnTitle = "正在上传中...";
this.$message({ this.$message({
@ -381,38 +414,38 @@ export default {
this.$refs.upload.clearFiles(); this.$refs.upload.clearFiles();
}, },
handleSizeChange (val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.pageSize = val; this.pageSize = val;
window.localStorage.setItem("pageSize", val); window.localStorage.setItem("pageSize", val);
this.getTableData(); this.getTableData();
}, },
handleCurrentChange (val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.pageNo = val; this.pageNo = val;
this.getTableData(); this.getTableData();
}, },
handleClose () { handleClose() {
this.formShow = false; this.formShow = false;
}, },
handleSearch (val) { handleSearch(val) {
console.log(this.fmData); console.log(this.fmData);
this.pageNo = 1; this.pageNo = 1;
this.getTableData(); this.getTableData();
}, },
resetForm (formName) { resetForm(formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
this.handleSearch(); this.handleSearch();
}, },
async handleAdd () { async handleAdd() {
this.formShow = true; this.formShow = true;
await nextTick(); await nextTick();
console.log(this.$refs); console.log(this.$refs);
this.$refs.eleEditForm.initForm("add"); this.$refs.eleEditForm.initForm("add");
}, },
async handleChu () { async handleChu() {
const url = const url =
"/heart/iccommunityselforganization/exportcommunityselforganization"; "/heart/iccommunityselforganization/exportcommunityselforganization";
const { pageSize, pageNo, fmData } = this; const { pageSize, pageNo, fmData } = this;
@ -448,23 +481,23 @@ export default {
}); });
}, },
async handleWatch (rowIndex) { async handleWatch(rowIndex) {
this.formShow = true; this.formShow = true;
await nextTick(); await nextTick();
this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]); this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
}, },
async handleEdit (rowIndex) { async handleEdit(rowIndex) {
this.formShow = true; this.formShow = true;
await nextTick(); await nextTick();
this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]); this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
}, },
handleEditSuccess () { handleEditSuccess() {
this.handleClose(); this.handleClose();
this.getTableData(); this.getTableData();
}, },
async handleDel (rowData, rowIndex) { async handleDel(rowData, rowIndex) {
console.log(rowData, rowIndex); console.log(rowData, rowIndex);
const url = const url =
"/heart/iccommunityselforganization/delcommunityselforganization"; "/heart/iccommunityselforganization/delcommunityselforganization";
@ -478,12 +511,12 @@ export default {
this.$message.success("删除成功！"); this.$message.success("删除成功！");
this.getTableData(); this.getTableData();
} else { } else {
this.$message.error(msg) this.$message.error(msg);
// this.$message.success("操作失败！"); // this.$message.success("操作失败！");
} }
}, },
async getTableData () { async getTableData() {
const url = const url =
"/heart/iccommunityselforganization/communityselforganizationlist"; "/heart/iccommunityselforganization/communityselforganizationlist";
const { pageSize, pageNo, fmData } = this; const { pageSize, pageNo, fmData } = this;
@ -497,23 +530,23 @@ export default {
this.total = data.total || 0; this.total = data.total || 0;
this.tableData = data.list this.tableData = data.list
? data.list.map((item) => { ? data.list.map((item) => {
return item; return item;
}) })
: []; : [];
} else { } else {
this.$message.error(msg) this.$message.error(msg);
} }
}, },
//积分记录 //积分记录
handleScore (row) { handleScore(row) {
this.scoreDiaShow = true; this.scoreDiaShow = true;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_score.initForm(row.orgId); this.$refs.ref_score.initForm(row.orgId);
}); });
}, },
diaClose () { diaClose() {
this.scoreDiaShow = false; this.scoreDiaShow = false;
}, },
}, },

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

@ -265,10 +265,26 @@
</div> </div>
</el-form> </el-form>
<slot v-bind:id="formId" v-bind:info="fmData" v-bind:formType="formType"></slot> <div class="div_btn resi-btns" v-if="!formBtnFixed">
<el-button size="small" @click="handleCancle">取 消</el-button>
<el-button
v-if="formType != 'watch'"
type="primary"
size="small"
:disabled="btnDisable"
@click="handleComfirm"
>确 定</el-button
>
</div>
<slot
v-bind:id="formId"
v-bind:info="fmData"
v-bind:formType="formType"
></slot>
</div> </div>
<div class="div_btn resi-btns"> <div class="div_btn resi-btns" v-if="formBtnFixed">
<el-button size="small" @click="handleCancle">取 消</el-button> <el-button size="small" @click="handleCancle">取 消</el-button>
<el-button <el-button
v-if="formType != 'watch'" v-if="formType != 'watch'"
@ -303,6 +319,10 @@ export default {
type: String, type: String,
default: "info", default: "info",
}, },
formBtnFixed: {
type: Boolean,
default: true,
},
idName: { idName: {
type: String, type: String,
default: "", default: "",
@ -431,8 +451,13 @@ export default {
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义 // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap(item) { initMap(item) {
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变量，调用 TMap.Map() 构造函数创建地图
map = new window.TMap.Map(document.getElementById("app"), { map = new window.TMap.Map(document.getElementById("app"), {
center: center, // 设置地图中心点坐标 center: center, // 设置地图中心点坐标
@ -545,7 +570,7 @@ export default {
console.log("------------------------------------info", this.fmData); console.log("------------------------------------info", this.fmData);
await nextTick(800); await nextTick(800);
if (map) { if (map && data.latitude) {
map.setCenter(new TMap.LatLng(data.latitude, data.longitude)); map.setCenter(new TMap.LatLng(data.latitude, data.longitude));
} }
} else { } else {

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

@ -212,6 +212,7 @@
:editParams="editParams" :editParams="editParams"
:editParamsDiv="editParamsDiv" :editParamsDiv="editParamsDiv"
:editFixedParams="editFixedParams" :editFixedParams="editFixedParams"
:formBtnFixed="formBtnFixed"
@close="handleClose" @close="handleClose"
@afterEdit="handleEditSuccess" @afterEdit="handleEditSuccess"
> >
@ -318,6 +319,11 @@ export default {
type: String, type: String,
default: "id", default: "id",
}, },
formBtnFixed: {
type: Boolean,
default: true,
},
}, },
data() { data() {
@ -535,11 +541,12 @@ export default {
handleClose() { handleClose() {
this.formShow = false; this.formShow = false;
this.getTableData();
}, },
handleEditSuccess() { handleEditSuccess() {
this.handleClose(); this.handleClose();
this.getTableData(); // this.getTableData();
}, },
async handleDelete(rowData, rowIndex) { async handleDelete(rowData, rowIndex) {

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

@ -12,6 +12,7 @@
:importUrl="importUrl" :importUrl="importUrl"
:mubanUrl="mubanUrl" :mubanUrl="mubanUrl"
:editParams="editParams" :editParams="editParams"
:editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')"
idName="icDangerousChemicalsId" idName="icDangerousChemicalsId"
></base-page> ></base-page>
</div> </div>

3
src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
View File

@ -192,7 +192,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="!disabled" label="操作" align="center" width="120"> <el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.isEdit"> <template v-if="scope.row.isEdit">
<el-button <el-button
@ -224,6 +224,7 @@
v-if="formType == 'edit'" v-if="formType == 'edit'"
title="删除之后无法恢复，确认删除？" title="删除之后无法恢复，确认删除？"
@onConfirm="del(scope.row)" @onConfirm="del(scope.row)"
@confirm="del(scope.row)"
> >
<el-button <el-button
slot="reference" slot="reference"

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

@ -17,10 +17,16 @@
:editFixedParams="editFixedParams" :editFixedParams="editFixedParams"
:editParamsDiv="5" :editParamsDiv="5"
:editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')" :editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')"
:formBtnFixed="false"
idName="enterpriseId" idName="enterpriseId"
> >
<template v-slot:editElse="{ id, formType, info }"> <template v-slot:editElse="{ id, formType, info }">
<record v-if="formType != 'add' && id" :formType="formType" :enterpriseId="id" :enterpriseInfo="info"></record> <record
v-if="formType != 'add' && id"
:formType="formType"
:enterpriseId="id"
:enterpriseInfo="info"
></record>
</template> </template>
</base-page> </base-page>
</div> </div>
@ -93,7 +99,7 @@ export default {
{ field: "场所名称", keyName: "placeOrgName", type: "text" }, { field: "场所名称", keyName: "placeOrgName", type: "text" },
{ field: "场所地址", keyName: "address", type: "text" }, { field: "场所地址", keyName: "address", type: "text" },
{ field: "场所类型", keyName: "placeTypeName", type: "text" }, { field: "场所类型", keyName: "placeTypeName", type: "text" },
{ field: "规模", keyName: "scale", type: "text" }, { field: "规模", keyName: "scaleName", type: "text" },
{ field: "负责人", keyName: "personInCharge", type: "text" }, { field: "负责人", keyName: "personInCharge", type: "text" },
{ field: "联系电话", keyName: "mobile", type: "text" }, { field: "联系电话", keyName: "mobile", type: "text" },
{ field: "最新检查时间", keyName: "latestPatrolTime", type: "text" }, { field: "最新检查时间", keyName: "latestPatrolTime", type: "text" },

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

@ -12,6 +12,7 @@
:importUrl="importUrl" :importUrl="importUrl"
:mubanUrl="mubanUrl" :mubanUrl="mubanUrl"
:editParams="editParams" :editParams="editParams"
:editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')"
idName="icSuperiorResourceId" idName="icSuperiorResourceId"
></base-page> ></base-page>
</div> </div>

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

@ -391,7 +391,7 @@ import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style
import nextTick from 'dai-js/tools/nextTick' import nextTick from 'dai-js/tools/nextTick'
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, requestGet } from "@/js/dai/request";
import cptTb from "@/views/modules/visual/cpts/tb"; import cptTb from "@/views/modules/visual/cpts/tb";
@ -1030,6 +1030,7 @@ const vueGis = {
this.selInfo = JSON.parse(JSON.stringify(data)) this.selInfo = JSON.parse(JSON.stringify(data))
this.handleShowPopup(coordinate) this.handleShowPopup(coordinate)
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
@ -1125,12 +1126,17 @@ const vueGis = {
this.getMapTable(); this.getMapTable();
}, },
handleSearch () { handleSearch () {
this.demand.pageNo = 1
this.getTable();
this.getMapTable();
}, },
// //
handleClickRow (index) { handleClickRow (index) {
let selData = this.tableList[index] let selData = this.tableList[index]
mapView.setCenter([selData.longitude, selData.latitude]); if (selData.longitude && selData.latitude) {
mapView.setCenter([selData.longitude, selData.latitude]);
}
this.clickMapVolunteer(selData) this.clickMapVolunteer(selData)
// alert(index) // alert(index)

Write Preview
Loading…
Cancel
Save