Skip to content

Z
zh-baseversion-project
Commit 0d7e386d authored by wanghao's avatar wanghao
Browse files
Options

1 基础信息维护-用户管理-燃气用户，拷贝 基础信息维护-燃气用户界面，并做相应调整

parent 66b2fabe
Hide whitespace changes
Inline Side-by-side
Showing with 673 additions and 7 deletions
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TDetectorUserController.java
View file @ 0d7e386d
......@@ -132,11 +132,29 @@ public class TDetectorUserController extends BaseController
//获取用户信息
SysUser user = SecurityUtils.getLoginUser().getUser();
tDetectorUser.setBeyondEnterpriseId(user.getDeptId());
//老的导出把居住区隐藏
ExcelUtil.hiddencolumns.add(10);
List<TDetectorUser> list = tDetectorUserService.selectTDetectorUserList(tDetectorUser);
ExcelUtil<TDetectorUser> util = new ExcelUtil<TDetectorUser>(TDetectorUser.class);
return util.exportExcel(list, "燃气用户数据");
AjaxResult ajaxResult = util.exportExcel(list, "燃气用户数据");
ExcelUtil.hiddencolumns.clear();
return ajaxResult;
}
/**
* 导出燃气用户列表-new 有居住区的导出
*/
@Log(title = "燃气用户", businessType = BusinessType.EXPORT)
@GetMapping("/newExport")
public AjaxResult newExport(TDetectorUser tDetectorUser)
{
//获取用户信息
SysUser user = SecurityUtils.getLoginUser().getUser();
tDetectorUser.setBeyondEnterpriseId(user.getDeptId());
List<TDetectorUser> list = tDetectorUserService.newSelectTDetectorUserList(tDetectorUser);
ExcelUtil<TDetectorUser> util = new ExcelUtil<TDetectorUser>(TDetectorUser.class);
return util.exportExcel(list, "燃气用户数据");
}
/**
* 获取燃气用户详细信息
*/
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TUserManageVillageController.java
View file @ 0d7e386d
......@@ -44,6 +44,17 @@ public class TUserManageVillageController extends BaseController
return getDataTable(list);
}
/**
* 查询基本信息维护-用户管理-居住区(村庄)列表-无分页
*/
@GetMapping("/noPagelist")
public List<TUserManageVillage> noPagelist(TUserManageVillage tUserManageVillage)
{
return tUserManageVillageService.selectTUserManageVillageList(tUserManageVillage);
}
/**
* 导出基本信息维护-用户管理-居住区(村庄)列表
*/
......
zh-baseversion-system/src/main/java/com/zehong/system/domain/TDetectorUser.java
View file @ 0d7e386d
......@@ -101,6 +101,17 @@ public class TDetectorUser extends BaseEntity
*/
private Long taskId;
/**
* 居住区村庄id
*/
private Long villageId;
/**
* 居住区村庄名称
*/
@Excel(name = "居住区(村、庄)")
private String villageName;
private List<Long> hasInspectUser;
......@@ -289,6 +300,22 @@ public class TDetectorUser extends BaseEntity
this.gasType = gasType;
}
public Long getVillageId() {
return villageId;
}
public void setVillageId(Long villageId) {
this.villageId = villageId;
}
public String getVillageName() {
return villageName;
}
public void setVillageName(String villageName) {
this.villageName = villageName;
}
@Override
public String toString() {
return "TDetectorUser{" +
......
zh-baseversion-system/src/main/java/com/zehong/system/mapper/TDetectorUserMapper.java
View file @ 0d7e386d
......@@ -61,6 +61,15 @@ public interface TDetectorUserMapper
* @return 燃气用户集合
*/
public List<TDetectorUser> selectTDetectorUserList(TDetectorUser tDetectorUser);
/**
* 查询燃气用户列表-new 有 居住区了
*
* @param tDetectorUser 燃气用户
* @return 燃气用户集合
*/
public List<TDetectorUser> newSelectTDetectorUserList(TDetectorUser tDetectorUser);
public List<TDetectorUser> selectTDetectorListstatus(TDetectorUser tDetectorUser);
/**
......
zh-baseversion-system/src/main/java/com/zehong/system/service/ITDetectorUserService.java
View file @ 0d7e386d
......@@ -85,6 +85,14 @@ public interface ITDetectorUserService
* @return 燃气用户集合
*/
public List<TDetectorUser> selectTDetectorUserList(TDetectorUser tDetectorUser);
/**
* 查询燃气用户列表
*
* @param tDetectorUser 燃气用户
* @return 燃气用户集合
*/
public List<TDetectorUser> newSelectTDetectorUserList(TDetectorUser tDetectorUser);
public List<TDetectorUser> selectTDetectorListstatus(TDetectorUser tDetectorUser);
/**
......
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TDetectorUserServiceImpl.java
View file @ 0d7e386d
......@@ -262,6 +262,18 @@ public class TDetectorUserServiceImpl implements ITDetectorUserService
{
return tDetectorUserMapper.selectTDetectorUserList(tDetectorUser);
}
/**
* 查询燃气用户列表-new
*
* @param tDetectorUser 燃气用户
* @return 燃气用户
*/
@Override
public List<TDetectorUser> newSelectTDetectorUserList(TDetectorUser tDetectorUser) {
return tDetectorUserMapper.newSelectTDetectorUserList(tDetectorUser);
}
@Override
public List<TDetectorUser> selectTDetectorListstatus(TDetectorUser tDetectorUser){
return tDetectorUserMapper.selectTDetectorListstatus(tDetectorUser);
......
zh-baseversion-system/src/main/resources/mapper/system/TDetectorUserMapper.xml
View file @ 0d7e386d
......@@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="isDel" column="is_del" />
<result property="remarks" column="remarks" />
<result property="beyondEnterpriseName" column="enterprise_name" />
<result property="villageId" column="f_village_id" />
<result property="villageName" column="f_village_name" />
</resultMap>
<resultMap type="TDetectorUserInspectVo" id="TDetectorUserInspectResult">
......@@ -40,18 +42,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTDetectorUserVo">
select user_id, username, nick_name, user_type, gas_type,address, longitude, latitude, linkman, phone, email, create_time, update_time, is_del, remarks from t_detector_user
select user_id, username, nick_name, user_type, gas_type,address, longitude, latitude, linkman, phone, email, create_time, update_time, is_del, remarks,f_village_id from t_detector_user
</sql>
<select id="selectTDetectorUserList" parameterType="TDetectorUser" resultMap="TDetectorUserResult">
select a.user_id,
a.username,
a.nick_name,
(CASE a.user_type WHEN '1' THEN '居民用户' WHEN '2' THEN '商业用户'WHEN '3' THEN '工业用户'WHEN '4' THEN '餐饮单位用户'end) as user_type ,
(CASE a.gas_type WHEN '0' THEN '天然气' WHEN '1' THEN '液化气' end) as gas_type ,
a.address, a.longitude, a.latitude, a.linkman, a.phone, a.email, a.create_time, a.update_time, a.is_del, a.remarks,
b.enterprise_name,a.f_village_id,v.f_village_name
from t_detector_user a left join t_enterprise_info b on a.beyond_enterprise_id=b.enterprise_id
left join t_user_manage_village v on a.f_village_id=v.f_village_id
<where> a.is_del = '0'
<if test="beyondEnterpriseId != null and beyondEnterpriseId != -2"> and a.beyond_enterprise_id =#{beyondEnterpriseId}</if>
<if test="username != null and username != ''"> and a.username like concat('%', #{username}, '%')</if>
<if test="nickName != null and nickName != ''"> and (a.nick_name like concat('%', #{nickName}, '%') or a.username like concat('%', #{nickName}, '%'))</if>
<if test="isInspect != null and isInspect == 0">
and a.user_id not in
<foreach item="hasInspectUser" collection="hasInspectUser" open="(" separator="," close=")">
#{hasInspectUser}
</foreach>
</if>
<if test="isInspect != null and isInspect == 1">
and a.user_id in
<foreach item="hasInspectUser" collection="hasInspectUser" open="(" separator="," close=")">
#{hasInspectUser}
</foreach>
</if>
</where>
order by a.user_id desc
</select>
<select id="newSelectTDetectorUserList" parameterType="TDetectorUser" resultMap="TDetectorUserResult">
select a.user_id,
a.username,
a.nick_name,
(CASE a.user_type WHEN '1' THEN '居民用户' WHEN '2' THEN '商业用户'WHEN '3' THEN '工业用户'WHEN '4' THEN '餐饮单位用户'end) as user_type ,
(CASE a.gas_type WHEN '0' THEN '天然气' WHEN '1' THEN '液化气' end) as gas_type ,
a.address, a.longitude, a.latitude, a.linkman, a.phone, a.email, a.create_time, a.update_time, a.is_del, a.remarks,
b.enterprise_name
b.enterprise_name,a.f_village_id,v.f_village_name
from t_detector_user a left join t_enterprise_info b on a.beyond_enterprise_id=b.enterprise_id
left join t_user_manage_village v on a.f_village_id=v.f_village_id
<where> a.is_del = '0'
<if test="beyondEnterpriseId != null and beyondEnterpriseId != -2"> and a.beyond_enterprise_id =#{beyondEnterpriseId}</if>
<if test="username != null and username != ''"> and a.username like concat('%', #{username}, '%')</if>
......@@ -71,6 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
order by a.user_id desc
</select>
<select id="selectTDetectorListstatus" parameterType="TDetectorUser" resultMap="TDetectorUserResult">
SELECT a.user_id, a.username, a.nick_name , a.address,
a.longitude, a.latitude, a.linkman, a.phone, a.email, a.create_time,
......@@ -107,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTDetectorUserById" parameterType="Long" resultMap="TDetectorUserResult">
select a.user_id, a.beyond_enterprise_id,a.username, a.nick_name, a.user_type,a.gas_type, a.address, a.longitude, a.latitude,
a.linkman, a.phone, a.email, a.create_time, a.update_time, a.is_del, a.remarks, b.enterprise_name
a.linkman, a.phone, a.email, a.create_time, a.update_time, a.is_del, a.remarks, b.enterprise_name,a.f_village_id
from t_detector_user a left join t_enterprise_info b on a.beyond_enterprise_id=b.enterprise_id
where a.user_id = #{userId}
</select>
......@@ -201,6 +236,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="email != null">email,</if>
<if test="isDel != null">is_del,</if>
<if test="remarks != null">remarks,</if>
<if test="villageId != null">f_village_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="username != null">#{username},</if>
......@@ -216,6 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="email != null">#{email},</if>
<if test="isDel != null">#{isDel},</if>
<if test="remarks != null">#{remarks},</if>
<if test="villageId != null">#{villageId},</if>
</trim>
</insert>
......@@ -237,6 +274,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="isDel != null">is_del = #{isDel},</if>
<if test="remarks != null">remarks = #{remarks},</if>
<if test="villageId != null">f_village_id = #{villageId},</if>
</trim>
where user_id = #{userId}
</update>
......
zh-baseversion-web/src/api/regulation/user.js
View file @ 0d7e386d
......@@ -50,4 +50,14 @@ export function exportUser(query) {
method: 'get',
params: query
})
}
// 导出燃气用户-新的-有居住区的导出
export function newExportUser(query) {
return request({
url: '/supervise/user/newExport',
method: 'get',
params: query
})
}
\ No newline at end of file
zh-baseversion-web/src/api/regulation/userManagement/village.js
View file @ 0d7e386d
......@@ -50,4 +50,14 @@ export function exportVillage(query) {
method: 'get',
params: query
})
}
\ No newline at end of file
}
// 查询基本信息维护-用户管理-居住区(村庄)列表-无分页
export function noPageListVillage(query) {
return request({
url: '/system/village/noPagelist',
method: 'get',
params: query
})
}
zh-baseversion-web/src/views/regulation/userManagement/gasUsers/index.vue 0 → 100644
View file @ 0d7e386d
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<!--<el-form-item label="用户账号" prop="username">
<el-input
v-model="queryParams.username"
placeholder="请输入用户账号"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="用户名称" prop="nickName">
<el-input
v-model="queryParams.nickName"
placeholder="请输入用户名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
:loading="exportLoading"
@click="handleExport"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!--<el-table-column label="用户账号" align="center" prop="username" />-->
<el-table-column label="用户名称" align="center" prop="nickName" >
<span slot-scope="scope" v-if="scope.row.nickName">{{scope.row.nickName}}</span>
<span v-else>-</span>
</el-table-column>
<el-table-column label="燃气类型" align="center" prop="gasType" >
<span slot-scope="scope" v-if="scope.row.gasType">{{scope.row.gasType}}</span>
<span v-else>-</span>
</el-table-column>
<el-table-column label="用户类型" align="center" prop="userType" >
<span slot-scope="scope" v-if="scope.row.userType">{{scope.row.userType}}</span>
<span v-else>-</span>
</el-table-column>
<el-table-column label="地址" align="center" prop="address" >
<span slot-scope="scope" v-if="scope.row.address">{{scope.row.address}}</span>
<span v-else>-</span>
</el-table-column>
<el-table-column label="所属企业" align="center" prop="beyondEnterpriseName" >
<span slot-scope="scope" v-if="scope.row.beyondEnterpriseName">{{scope.row.beyondEnterpriseName}}</span>
<span v-else>-</span>
</el-table-column>
<el-table-column label="居住区(村、庄)" width="120" align="center" prop="villageName" >
<span slot-scope="scope" v-if="scope.row.villageName">{{scope.row.villageName}}</span>
<span v-else>-</span>
</el-table-column>
<el-table-column label="经度" align="center" prop="longitude" >
<span slot-scope="scope" v-if="scope.row.longitude">{{scope.row.longitude}}</span>
<span v-else>-</span>
</el-table-column>
<el-table-column label="纬度" align="center" prop="latitude" >
<span slot-scope="scope" v-if="scope.row.latitude">{{scope.row.latitude}}</span>
<span v-else>-</span>
</el-table-column>
<el-table-column label="联系人" align="center" prop="linkman" >
<span slot-scope="scope" v-if="scope.row.linkman">{{scope.row.linkman}}</span>
<span v-else>-</span>
</el-table-column>
<el-table-column label="电话" align="center" prop="phone" >
<span slot-scope="scope" v-if="scope.row.phone">{{scope.row.phone}}</span>
<span v-else>-</span>
</el-table-column>
<el-table-column label="邮箱" align="center" prop="email" >
<span slot-scope="scope" v-if="scope.row.email">{{scope.row.email}}</span>
<span v-else>-</span>
</el-table-column>
<!--<el-table-column label="备注" align="center" prop="remarks" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改燃气用户对话框 -->
<el-dialog :title="title" :visible.sync="open"width="780px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="11">
<el-form-item label="用户账号" prop="username">
<el-input v-model="form.username" placeholder="请输入用户账号" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="用户名称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="燃气类型" prop="gasType">
<el-select v-model="form.gasType" placeholder="请选择燃气类型">
<el-option v-for="dict in gasTypeOpers" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="用户类型" prop="userType">
<el-select v-model="form.userType" placeholder="请选择用户类型">
<el-option v-for="dict in userTypeOpers" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="所属企业" prop="beyondEnterpriseId">
<el-select v-model="form.beyondEnterpriseId" placeholder="请在下拉框中选择名称" maxlength="255" :disabled="false" clearable style="width: 100%;">
<el-option v-for="item in test" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="居住区(村、庄)" prop="villageId">
<el-select v-model="form.villageId" placeholder="请在下拉框中选择名称" maxlength="255" :disabled="false" clearable style="width: 100%;">
<el-option v-for="item in villageList" :key="item.fVillageId" :label="item.fVillageName" :value="item.fVillageId">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item label="经度" prop="longitude">-->
<!-- <el-input v-model="form.longitude" placeholder="请输入经度" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item label="纬度" prop="latitude">-->
<!-- <el-input v-model="form.latitude" placeholder="请输入纬度" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row>
<el-col :span="22">
<el-form-item label="地址" prop="address">
<el-input v-model="form.address" placeholder="请输入地址" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="21">
<el-form-item label="经纬度坐标" prop="longitude">
<el-col :span="9">
<el-input v-model="form.longitude" placeholder="请输入经度" />
</el-col>
<el-col :span="9" style="margin-left: 15px">
<el-input v-model="form.latitude" placeholder="请输入纬度"/>
</el-col>
<el-col :span="3" style="margin-left: 33px">
<el-button type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="联系人" prop="linkman">
<el-input v-model="form.linkman" placeholder="请输入联系人" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="电话" prop="phone">
<el-input onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="form.phone" placeholder="请输入电话" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" type="textarea" placeholder="请输入邮箱" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<GetPos
:dialogVisible.sync="dialogTableVisibles"
device=""
:devicePos="devicePos"
@close="dialogcancelFun"
@getPath="getPath"
/>
</div>
</template>
<script>
import { listUser, getUser, delUser, addUser, updateUser,newExportUser } from "@/api/regulation/user";
import { selectTEnterprise} from "@/api/regulation/supervise";
import { noPageListVillage} from "@/api/regulation/userManagement/village";
import GetPos from '@/components/GetPos';
export default {
name: "User",
components: {
GetPos
},
data() {
return {
//下拉框数据
test:{},
/**--------------地图使用数据---------------*/
dialogTableVisibles: false,
devicePos: [],
/**--------------地图使用数据---------------*/
// 居住区数据集合
villageList:[],
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 燃气用户表格数据
userList: [],
// 燃气类型
userTypeOpers: [],
// 燃气类型
gasTypeOpers: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
username: null,
nickName: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
/*username: [
{ required: true, message: "请输入用户账号", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],*/
nickName: [
{ required: true, message: "请输入用户名称", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
userType: [
{ required: true, message: "请选择用户类型", trigger: "blur" },
],
address: [
{ required: true, message: "请输入地址", trigger: "blur" },
// { min: 0, max: 30, message: "长度30位", trigger: "blur" },
],
}
};
},
created() {
this.getList();
this.getDicts("yehuaqi_user_type").then(response => {
this.userTypeOpers = response.data;
});
this.getDicts("gas_type").then(response => {
this.gasTypeOpers = response.data;
});
this.getNoPageListVillage();
},
methods: {
//获取居住区集合
getNoPageListVillage(){
noPageListVillage(this.queryForm).then(response => {
this.villageList = response;
});
},
/** 查询燃气用户列表 */
getList() {
this.loading = true;
listUser(this.queryParams).then(response => {
this.userList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
userId: null,
username: null,
nickName: null,
userType: null,
gasType: null,
address: null,
longitude: null,
latitude: null,
linkman: null,
phone: null,
email: null,
isDel: null,
remarks: null,
fVillageId:null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.userId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
//查询企业名称下拉框数据
selectTEnterprise().then(response => {
this.test = response.data;
});
this.reset();
this.open = true;
this.title = "添加燃气用户";
},
/** 修改按钮操作 */
handleUpdate(row) {
//查询企业名称下拉框数据
selectTEnterprise().then(response => {
this.test = response.data;
});
this.reset();
const userId = row.userId || this.ids
getUser(userId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改燃气用户";
this.devicePos = [response.data.longitude, response.data.latitude];
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.userId != null) {
updateUser(this.form).then(response => {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addUser(this.form).then(response => {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const userIds = row.userId || this.ids;
this.$confirm('是否确认删除燃气用户编号为"' + userIds + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delUser(userIds);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有燃气用户数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.exportLoading = true;
return newExportUser(queryParams);
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
},
/**
* 经纬度坐标方法
*/
MapdialogFun() {
this.dialogTableVisibles = true;
},
/**
* 地图关闭方法
*/
dialogcancelFun() {
this.dialogTableVisibles = false;
},
/**
* 经纬度 选择
* @param res
*/
getPath(res){
//确认选择经纬度
this.form.longitude = res[0];
this.form.latitude = res[1];
}
}
};
</script>
zh-baseversion-web/vue.config.js
View file @ 0d7e386d
......@@ -34,9 +34,9 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:8905/gassafety`,
target: `http://localhost:8905/gassafety`,
// target: `http://27.128.233.145:8905/gassafety`,
target: `http://36.138.180.82:8905/gassafety`,
// target: `http://36.138.180.82:8905/gassafety`,
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment