Browse Source

用户权限自定义

yf_zd 5 năm trước cách đây
mục cha
commit
e495281ced

+ 32 - 33
bigdata2/src/components/Index.vue

@@ -1,6 +1,9 @@
 <template>
 	<el-container style="height: 100%">
 		<el-header>
+			<div v-if="userinfo.logo">
+				<img :src="userinfo.logo" alt=""  style="position: absolute;left: 20px;top: 20px;width: 136px;">
+			</div>
 			<div class="navbarBtn">
 				<!-- 用户 -->
 				<div class="userinfo">
@@ -8,7 +11,8 @@
 				</div>
 				<!-- 标题 -->
 				<div class="caption">
-					<div class="tit">农业植保监测系统 智慧农业信息化</div>
+					<div v-if="userinfo.user_header" class="tit">{{userinfo.user_header}}</div>
+					<div v-else class="tit">农业植保监测系统 智慧农业信息化</div>
 					<div>
 						Agricultural plant protection monitoring system intelligent
 						agricultural informatization
@@ -16,37 +20,10 @@
 				</div>
 			</div>
 		</el-header>
-		<!-- 修改密码对话框 -->
-		<el-dialog
-			title="重置密码"
-			:visible.sync="resetPassDialogVisible"
-			width="500px"
-			@close="resetPassDialogClosed"
-		>
-			<el-form
-				ref="resetPassFormRef"
-				:model="resetPassForm"
-				label-width="90px"
-				:rules="resetPassFormRules"
-			>
-				<el-form-item label="原始密码 : " prop="oldPass">
-					<el-input type="password" v-model="resetPassForm.oldPass"></el-input>
-				</el-form-item>
-				<el-form-item label="新密码 : " prop="newPass">
-					<el-input type="password" v-model="resetPassForm.newPass"></el-input>
-				</el-form-item>
-				<el-form-item label="确认新密码 : " prop="checkNewPass">
-					<el-input
-						type="password"
-						v-model="resetPassForm.checkNewPass"
-					></el-input>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="resetPassDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="resetPassSubm">确认</el-button>
-			</span>
-		</el-dialog>
+		<div class="site" v-if="userinfo.site">
+			<i class="iconfont icon-jidi"></i>
+			<span>{{userinfo.site}}</span>
+		</div>
 		<el-container style="overflow: auto">
 			<!-- 菜单 -->
 			<el-aside width="200px">
@@ -113,7 +90,7 @@ export default {
 				5: 'iconfont icon-shebei',
 				6: 'iconfont icon-xitong'
 			},
-
+			userinfo:'',
 			menuList1: [{
 			"purview_name": "性诱测报",
 			"menu": "xycb",
@@ -195,6 +172,15 @@ export default {
 			}).then((res) => {
 				this.username = res.data.username
 				this.userphoto = res.data.userphoto
+				localStorage.setItem('username', res.data.username)  // 0管理员  1用户
+			})
+			this.$axios({
+				method: 'get',
+				url: '/api/user_detail'
+			}).then((res) => {
+				this.userinfo = res.data
+				localStorage.setItem('have_type', this.userinfo.have_type)  // 0管理员  1用户
+				localStorage.setItem('staff', this.userinfo.staff)  // 1是admin
 			})
 		},
 		getNavList() {
@@ -382,6 +368,19 @@ export default {
 		}
 	}
 }
+.site{
+	position: absolute;
+    right: 10px;
+    top: 199px;
+    z-index: 888;
+	font-size: 14px;
+	color: #226a4d;
+	span{
+		color: #333;
+		letter-spacing: 1px;
+		font-size: 13px;
+	}
+}
 /deep/.el-dropdown-menu__item {
 	padding: 0 10px;
 }

+ 193 - 381
bigdata2/src/components/UserManger.vue

@@ -6,32 +6,6 @@
 		</el-breadcrumb>
 		<div class="search-box">
 			<div class="filter-box">
-				<el-select
-					size="small"
-					v-model="role"
-					placeholder="请选择角色类型"
-					clearable
-					@change="checkList()"
-				>
-					<el-option
-						v-for="item in roleList"
-						:label="item.role_name"
-						:value="item.role_id"
-						:key="item.role_id"
-					></el-option>
-				</el-select>
-				<el-select
-					size="small"
-					v-model="userTypeCheck"
-					placeholder="请选择用户类型"
-					clearable
-					@change="checkList()"
-				>
-					<el-option label="超级管理员" :value="1"></el-option>
-					<el-option label="经销商" :value="2"></el-option>
-					<el-option label="农林政府单位" :value="3"></el-option>
-					<el-option label="普通用户" :value="4"></el-option>
-				</el-select>
 				<el-input
 					size="small"
 					placeholder="请输入用户名"
@@ -42,10 +16,8 @@
 					<i slot="suffix" class="el-input__icon el-icon-search"></i>
 				</el-input>
 			</div>
-			<a href="systemmanage_user_add">添加新用户</a>
-			<el-button type="primary" size="mini" @click="addUser()"
-				>添加新用户</el-button
-			>
+			
+			<el-button v-if="have_type==0||staff==1" type="primary" size="mini" ><a style="color:#fff" href="systemmanage_user_add">添加新用户</a></el-button >
 		</div>
 		<el-row :gutter="10">
 			<el-col
@@ -59,71 +31,50 @@
 			>
 				<el-card class="box-card pad0">
 					<div class="img-box">
-						<img
-							v-if="item.state == 1"
-							src="@/assets/images/systemManger/user.png"
-						/>
-						<img
-							v-if="item.state == 4"
-							src="@/assets/images/systemManger/user_dis.png"
-						/>
+						<img src="@/assets/images/systemManger/user.png" />
 						<p>{{ item.username }}</p>
-						<div>
-							<el-button type="text" @click="login(item.uid, item.username)"
-								>一键登录</el-button
-							>
-						</div>
 					</div>
 					<div class="detail">
 						<p>
-							创建时间
-							<span>{{ (item.addtime * 1000) | formatTime }}</span>
-						</p>
-						<p>
-							用户角色
-							<span>{{ item.role_name }}</span>
+							模块类型
+							<span v-if="item.user_type == '1' ">农林植保平台</span>
+							<span v-if="item.user_type == '2' ">环境监测平台</span>
+							<span v-if="item.user_type == '3' ">气象预警平台</span>
+							<span v-if="item.user_type == '4' ">溯源平台</span>
+							<span v-if="item.user_type == '5' ">可视化农业</span>
+							<span v-if="item.user_type == '6' ">监测平台</span>
 						</p>
 						<p>
-							用户所属
-							<span>{{ item.regiest_source_name || '--' }}</span>
+							用户类型
+							<span v-if="item.user_have_type == '1' ">普通用户</span>
+							<span v-if="item.user_have_type == '0' ">管理员</span>
 						</p>
 						<p>
-							用户类型
-							<span>{{ item.user_type | formatUserType }}</span>
+							站点名称
+							<span>{{ item.site || '无' }}</span>
 						</p>
 						<p>
-							用户手机号
-							<span>{{ item.mobile }}</span>
+							站点地址
+							<span>{{ item.user_pro }} {{ item.user_city }} {{ item.user_area }}</span>
 						</p>
 						<p>
-							上次登录
-							<span>{{ (item.login_time * 1000) | formatTime }}</span>
+							标题
+							<span>{{ item.user_header || '--' }}</span>
 						</p>
 						<p>
-							用户到期时间
-							<span>{{ (item.expire_time * 1000) | formatTime }}</span>
+							logo
+							<span><img style="width: 46px;height: 32px;" :src="item.logo" alt=""></span>
 						</p>
 					</div>
 					<div class="btn">
-						<a @click="recharge(item.uid)">
-							<i class="iconfont icon-chongzhi"></i>充值
-						</a>
-						<a @click="edit(item)">
+						<el-button type="success" @click="edit(item)" plain>用户编辑</el-button>
+						<el-button type="success" @click="resetPassword(item.id, item.username)" plain>重置密码</el-button>
+						<!-- <a @click="edit(item)">
 							<i class="iconfont icon-iconfontedit"></i>编辑
 						</a>
-						<template v-if="item.state == 1">
-							<a @click="forbidUse(item.uid, 4, '确认禁用该用户?')">
-								<i class="iconfont icon-jinyong"></i>禁用
-							</a>
-						</template>
-						<template v-else>
-							<a @click="forbidUse(item.uid, 1, '确认恢复该用户?')">
-								<i class="iconfont icon-jinyong"></i>恢复
-							</a>
-						</template>
 						<a @click="resetPassword(item.uid, item.username)">
 							<i class="iconfont icon-mima"></i>密码
-						</a>
+						</a> -->
 					</div>
 				</el-card>
 			</el-col>
@@ -131,7 +82,7 @@
 		<!-- 暂无数据 -->
 		<div class="expertDiagnosis_referral_units_not" v-if="userList.length <= 0">
 			<img
-				:src="$imghost + zanwu"
+				src="@/assets/images/zanwu.png"
 				alt
 				class="expertDiagnosis_referral_units_notImg"
 			/>
@@ -183,121 +134,7 @@
 				<el-button type="primary" @click="resetPassSubm">确认</el-button>
 			</span>
 		</el-dialog>
-		<!-- 添加新用户 -->
-		<el-dialog
-			title="添加新用户"
-			:visible.sync="addUserDialogVisible"
-			width="30%"
-			@close="addUserDialogClosed"
-		>
-			<el-form
-				ref="addUserFormRef"
-				:model="addUserForm"
-				label-width="80px"
-				:rules="addUserFormRules"
-			>
-				<el-form-item label="用户名 : " prop="username">
-					<el-input v-model="addUserForm.username"></el-input>
-				</el-form-item>
-				<el-form-item label="电话 : " prop="mobile">
-					<el-input v-model="addUserForm.mobile"></el-input>
-				</el-form-item>
-				<el-form-item label="密码  : " prop="pass">
-					<el-input v-model="addUserForm.pass"></el-input>
-				</el-form-item>
-				<el-form-item label="角色类型 : ">
-					<el-select
-						style="width: 100%"
-						size="small"
-						v-model="addUserForm.role_id"
-						placeholder="请选择角色类型"
-					>
-						<el-option
-							v-for="item in roleList"
-							:label="item.role_name"
-							:value="item.role_id"
-							:key="item.role_id"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="主题 : " prop="user_group_id">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="addUserForm.user_group_id"
-						placeholder="请选择主题"
-					>
-						<el-option
-							v-for="(item, index) in userGroupList"
-							:label="item.role_describe"
-							:value="item.id"
-							:key="index"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="用户类型 : " prop="user_type" v-if="userType == 1">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="addUserForm.user_type"
-						@change="userTypeChange"
-						placeholder="请选择角色类型"
-					>
-						<el-option label="超级管理员" :value="1"></el-option>
-						<el-option label="经销商" :value="2"></el-option>
-						<el-option label="农林政府单位" :value="3"></el-option>
-						<el-option label="普通用户" :value="4"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="用户类型 : " prop="user_type" v-if="userType != 1">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="addUserForm.user_type"
-						@change="userTypeChange"
-						placeholder="请选择角色类型"
-					>
-						<el-option label="普通用户" :value="4"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="省/市/区 : " v-show="editIsShow" prop="pcd">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="addUserForm.pcd"
-						placeholder="请选择省、市、县"
-						@change="pcdChange"
-					>
-						<el-option label="省" value="1"></el-option>
-						<el-option label="市" value="2"></el-option>
-						<el-option label="县" value="3"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="省/市/区 : " v-show="editIsShow" prop="user_area">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="addUserForm.user_area"
-						placeholder="请选择省、市、县"
-						@change="pcdChange"
-					>
-						<el-option
-							:label="item"
-							:value="item"
-							v-for="item in areaList"
-							:key="item"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="测试用户" prop="cs_user">
-					<el-switch v-model="addUserForm.cs_user"></el-switch>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="addUserDialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="addUserSubm">确认</el-button>
-			</span>
-		</el-dialog>
+
 		<!-- 用户编辑 -->
 		<el-dialog
 			title="用户信息编辑"
@@ -309,107 +146,40 @@
 				ref="editUserFormRef"
 				:model="editUserForm"
 				label-width="80px"
-				:rules="editUserFormRules"
 			>
 				<el-form-item label="用户名 : ">
 					<el-input v-model="editUserForm.username" disabled></el-input>
 				</el-form-item>
-				<el-form-item label="电话 : " prop="mobile">
-					<el-input v-model="editUserForm.mobile"></el-input>
-				</el-form-item>
-				<el-form-item label="角色类型 : " prop="role_id">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.role_id"
-						placeholder="请选择角色类型"
-					>
-						<el-option
-							v-for="item in roleList"
-							:label="item.role_name"
-							:value="item.role_id"
-							:key="item.role_id"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="用户组 : " prop="user_group_id">
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.user_group_id"
-						placeholder="请选择用户组"
-					>
-						<el-option
-							v-for="(item, index) in userGroupList"
-							:label="item.role_describe"
-							:value="item.id"
-							:key="index"
-						></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="用户类型 : " prop="user_type" v-if="userType == 1">
-					<el-select
-						disabled
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.user_type"
-						@change="userTypeChange"
-						placeholder="请选择角色类型"
-					>
-						<el-option label="超级管理员" :value="1"></el-option>
-						<el-option label="经销商" :value="2"></el-option>
-						<el-option label="农林政府单位" :value="3"></el-option>
-						<el-option label="普通用户" :value="4"></el-option>
-					</el-select>
+				<el-form-item label="标题 : " >
+					<el-input maxlength="11" v-model="editUserForm.user_header"></el-input>
 				</el-form-item>
-				<el-form-item label="用户类型 : " prop="user_type" v-if="userType != 1">
-					<el-select
-						disabled
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.user_type"
-						@change="userTypeChange"
-						placeholder="请选择角色类型"
+				<el-form-item label="logo : " >
+					<el-upload
+						class="avatar-uploader"
+						action
+						:auto-upload="false"
+						:show-file-list="false"
+						:on-change="changeUpload"
 					>
-						<el-option label="普通用户" :value="4"></el-option>
-					</el-select>
+						<img v-if="editUserForm.logo" :src="editUserForm.logo" class="avatar" />
+						<i v-else class="el-icon-plus avatar-uploader-icon"></i>
+					</el-upload>
 				</el-form-item>
-				<el-form-item
-					label="省/市/区 : "
-					v-show="editIsShow || editUserForm.user_type == 3"
-					prop="pcd"
-				>
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.pcd"
-						placeholder="请选择省、市、县"
-						@change="pcdChange"
-					>
-						<el-option label="省" value="1"></el-option>
-						<el-option label="市" value="2"></el-option>
-						<el-option label="县" value="3"></el-option>
-					</el-select>
+				<el-form-item label="站点名称 : " >
+					<el-input maxlength="16" v-model="editUserForm.site"></el-input>
 				</el-form-item>
-				<el-form-item
-					label="省/市/区 : "
-					v-show="editIsShow || editUserForm.user_type == 3"
-					prop="user_area"
-				>
-					<el-select
-						style="width: 100%"
-						clearable
-						v-model="editUserForm.user_area"
-						placeholder="请选择省、市、县"
-						@change="pcdChange"
-					>
-						<el-option
-							:label="item"
-							:value="item"
-							v-for="item in areaList"
-							:key="item"
-						></el-option>
-					</el-select>
+				<el-form-item label="站点位置 : ">
+					<div class="block">
+						<el-cascader
+							placeholder="搜索:河南"
+							v-model="cityValue"
+							:options="cityData"
+							:props="props"
+							@change="handleChange"
+							filterable
+						>
+						</el-cascader>
+					</div>
 				</el-form-item>
 			</el-form>
 			<span slot="footer" class="dialog-footer">
@@ -417,11 +187,32 @@
 				<el-button type="primary" @click="editUserSubm">确认</el-button>
 			</span>
 		</el-dialog>
+		<!-- vueCropper 剪裁图片实现-->
+		<el-dialog title="图片剪裁" :visible.sync="cropperVisible" append-to-body>
+			<div class="cropper-content">
+				<div style="width: 100%; height: 500px">
+					<vueCropper
+						ref="cropper"
+						:img="photo.img"
+						autoCrop
+						centerBox
+						fixed
+						:fixedNumber="photo.fixedNumber"
+						:outputSize="photo.size"
+						:outputType="photo.outputType"
+					></vueCropper>
+				</div>
+			</div>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="cropperVisible = false">取 消</el-button>
+				<el-button type="primary" @click="finish">确认</el-button>
+			</div>
+		</el-dialog>
 	</div>
 </template>
 
 <script>
-// import cityData from './citydata'
+import cityData from './citydata.js'
 export default {
 	inject: ['reload'],
 	data() {
@@ -486,14 +277,35 @@ export default {
 				cs_user:false,//1为普通用户
 				user_group_id:'' //用户组id
 			},
-			// cityData,
+			cropperVisible: false,
+			// 裁剪组件的基础配置option
+			photo: {
+				img: '', // 裁剪图片的地址
+				info: true, // 裁剪框的大小信息
+				outputSize: 0.8, // 裁剪生成图片的质量
+				outputType: 'jpeg', // 裁剪生成图片的格式
+				// canScale: false, // 图片是否允许滚轮缩放
+				// autoCrop: true, // 是否默认生成截图框
+				// autoCropWidth: 300, // 默认生成截图框宽度
+				// autoCropHeight: 200, // 默认生成截图框高度
+				// fixedBox: true, // 固定截图框大小 不允许改变
+				fixed: true, // 是否开启截图框宽高固定比例
+				fixedNumber: [230, 165], // 截图框的宽高比例
+				full: true, // 是否输出原图比例的截图
+				canMoveBox: false, // 截图框能否拖动
+				original: false, // 上传图片按照原始比例渲染
+				centerBox: false, // 截图框是否被限制在图片里面
+				infoTrue: true // true 为展示真实输出图片宽高 false 展示看到的截图框宽高
+			},
+			cityData,
+			cityValue: [],
+			props: {
+				expandTrigger: 'hover',
+				value: 'value'
+			},
 			editUserForm: {},
 			//控制省/市/区显示
 			editIsShow: false,
-			//编辑用户规则
-			editUserFormRules: {
-				user_phone: [{ validator: checkMobile, trigger: 'blur' }]
-			},
 			//添加用户规则
 			addUserFormRules: {
 				username: [
@@ -516,7 +328,9 @@ export default {
 					{ validator: validatePass2, trigger: 'blur' },
 					{ required: true, message: '请确认新密码', trigger: 'blur' }
 				]
-			}
+			},
+			have_type:'',
+			staff:'',
 		}
 	},
 	computed: {
@@ -526,44 +340,25 @@ export default {
 		}
 	},
 	created() {
-		this.getRoleList()
 	},
 	mounted() {
 		this.getList()
-		this.getUserGroup() //获取用户组
+		this.have_type = localStorage.getItem('have_type')  // 0管理员  1用户
+		this.staff = localStorage.getItem('staff')  // 1是admin
 	},
 	methods: {
-		getRoleList() {
-			this.$axios({
-				method: 'POST',
-				url: '/api/api_gateway?method=user.perms.role_list'
-			}).then((res) => {
-				if (res.data.message == '') {
-					this.roleList = res.data.data.map((item) => {
-						return {
-							role_id: item.role_id,
-							role_name: item.role_name
-						}
-					})
-				}
-			})
-		},
 		getList() {
 			this.$axios({
 				method: 'POST',
-				url: '/api/api_gateway?method=user.login.users_info',
+				url: '/api/user_list',
 				data: this.qs.stringify({
-					role_id: this.role,
-					page_size: 8,
-					user_type: this.userTypeCheck,
+					typelist:1,
 					page: this.page,
-					username: this.username
+					uname: this.username
 				})
 			}).then((res) => {
-				if (res.data.message == '') {
-					this.userList = res.data.data.data
-					this.totalNum = res.data.data.count
-				}
+				this.userList = res.data.userlist
+				this.totalNum = res.data.nums
 			})
 		},
 		getUserGroup() {
@@ -616,12 +411,59 @@ export default {
 		},
 		// 编辑用户信息
 		edit(role) {
-			this.editUserForm = role
-			if (role.role_id == 0) {
-				//把0转换成""
-				this.editUserForm.role_id = ''
-			}
+			this.editUserForm = JSON.parse(JSON.stringify(role))
 			this.editUserDialogVisible = true
+			this.cityValue = [this.editUserForm.user_pro,this.editUserForm.user_city,this.editUserForm.user_area]
+			
+		},
+		// 上传按钮   限制图片大小
+		changeUpload(file, fileList) {
+			const isLt4M = file.size / 1024 / 1024 < 4
+			if (!isLt4M) {
+				this.$message.error('上传文件大小不能超过 4MB!')
+				return false
+			}
+			// 上传成功后将图片地址赋值给裁剪框显示图片
+			this.$nextTick(() => {
+				this.photo.img = URL.createObjectURL(file.raw)
+				this.cropperVisible = true
+			})
+		},
+		// 点击裁剪,这一步是可以拿到处理后的地址
+		finish() {
+			// 获取截图的base64 数据
+			this.$refs.cropper.getCropBlob((data) => {
+				var form = new FormData()
+				let resFile = this.blobToFile(data, 'filename.jpg')
+				form.append('img_file', resFile)
+
+				this.cropperVisible = false
+				this.$axios({
+					method: 'POST',
+					url: '/api/base_photo',
+					data: form
+				}).then((res) => {
+					this.editUserForm.logo = res.data.src
+				})
+			})
+		},
+		//转成file
+		blobToFile(Blob, fileName) {
+			Blob.lastModifiedDate = new Date()
+			Blob.name = fileName
+			return Blob
+		},
+		handleChange(value) {
+			console.log(value)
+			console.log(this.cityValue)
+			this.editUserForm.user_pro = value[0]
+			this.editUserForm.user_city = value[1]
+			if(value[2]){
+				this.editUserForm.user_area = value[2]
+			}else{
+				this.editUserForm.user_city = value[0].substring(0,value[0].length-1)
+				this.editUserForm.user_area = value[1]
+			}
 		},
 		login(uid, username) {
 			//一键登录
@@ -698,42 +540,9 @@ export default {
 		},
 		//密码重置
 		resetPassword(id, name) {
-			// this.resetPassForm.uid = id
-			// this.resetPassForm.username = name
-			// this.resetPassDialogVisible = true
-			this.$confirm('是否重置密码 ? 重置后的密码为 yf_123456', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			})
-				.then(() => {
-					this.$axios({
-						method: 'POST',
-						url: '/api/api_gateway?method=user.login.admin_changepwd',
-						data: this.qs.stringify({
-							uid: id
-						})
-					}).then((res) => {
-						if (res.data.message == '') {
-							this.$message({
-								type: 'success',
-								message: '操作成功!'
-							})
-							this.getList()
-						} else {
-							this.$message({
-								type: 'warning',
-								message: res.data.message
-							})
-						}
-					})
-				})
-				.catch(() => {
-					this.$message({
-						type: 'info',
-						message: '取消重置密码!'
-					})
-				})
+			this.resetPassForm.id = id
+			this.resetPassForm.username = name
+			this.resetPassDialogVisible = true
 		},
 		resetPassSubm() {
 			//暂时不用
@@ -741,15 +550,16 @@ export default {
 				if (!valid) return
 				this.$axios({
 					method: 'POST',
-					url: '/api/api_gateway?method=user.login.changepwd',
+					url: '/api/systemmanage_user_list',
 					data: this.qs.stringify({
-						uid: this.resetPassForm.uid,
-						old_password: this.resetPassForm.oldPass,
-						new_password: this.resetPassForm.pass,
-						confirm_password: this.resetPassForm.checkPass
+						id: this.resetPassForm.id,
+						req: 'resetpwd',
+						userName:this.editUserForm.username,
+						userpassWord: this.resetPassForm.pass,
+						userRePassWord: this.resetPassForm.pass,
 					})
 				}).then((res) => {
-					if (res.data.message == '') {
+					if (res.data == 0) {
 						this.$message.success('修改密码成功')
 						this.resetPassDialogVisible = false
 					} else {
@@ -844,21 +654,17 @@ export default {
 				if (!valid) return
 				this.$axios({
 					method: 'POST',
-					url: '/api/api_gateway?method=user.login.users_info_updata',
-					data: this.qs.stringify({
-						uid: this.editUserForm.uid,
-						// username: this.editUserForm.username,
-						mobile: this.editUserForm.mobile,
-						role_id: this.editUserForm.role_id,
-						user_type: this.editUserForm.user_type,
-						pcd: this.editUserForm.pcd,
-						user_area: this.editUserForm.user_area,
-						user_group_id: this.editUserForm.user_group_id
-					})
+					url: '/api/user_detail',
+					data: this.qs.stringify(this.editUserForm)
 				}).then((res) => {
-					if (res.data.message == '') {
+					if (res.data == 1) {
 						this.editUserDialogVisible = false
-						this.getList()
+						var curr = localStorage.getItem('username');
+						if(curr == this.editUserForm.username){
+							window.location.reload()
+						}else{
+							this.getList()
+						}
 					}
 				})
 			})
@@ -938,20 +744,26 @@ export default {
 		padding: 20px 10px;
 		display: flex;
 		justify-content: space-around;
-		a {
-			flex: 1;
+		button {
+			// flex: 1;
 			margin: 0 8px;
 			border: 1px solid #17bb89;
 			color: #17bb89;
-			border-radius: 4px;
-			font-size: 12px;
-			padding: 5px 5px;
+			// border-radius: 4px;	
+			// font-size: 12px;
+			// padding: 5px 5px;
+			background: #fff;
 			cursor: pointer;
 			i {
 				font-size: 12px;
 				margin-right: 2px;
 			}
 		}
+		button:hover{
+			background: #fff;
+			border: 1px solid #47d9ad;
+    		color: #47d9ad;
+		}
 	}
 }
 // 暂无数据

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 13586 - 0
bigdata2/src/components/citydata.js