修改

src/axios/services.js

@@ -267,6 +267,12 @@ const requests = {
       method: 'get'
     })
   },
+  putPassword(data) {
+    return axios(ip + '/manage/user/password', {
+      method: 'put',
+      data: data
+    })
+  },
   //   postUserLogin(data) { // 用户登录
   //       console.log(data);
   //       return axios('http://192.168.1.7:8082/userLogin', {

src/components/headerDetail.vue

@@ -100,7 +100,7 @@
 //生命周期 - 挂载完成（可以访问DOM元素）
 		mounted () {
 			let loginData = JSON.parse(this.$Base64.decode(localStorage.getItem('login')))
-			console.log(loginData)
+			// console.log(loginData)
 			this.name= loginData.username;
 		},
 		beforeCreate () {

src/components/mainBreadcrumb.vue

@@ -63,7 +63,7 @@
 //生命周期 - 挂载完成（可以访问DOM元素）
 		mounted () {
 			let datas = JSON.parse(this.$Base64.decode(localStorage.getItem('login')));
-			console.log(datas)
+			// console.log(datas)
 			this.authority = datas;
 			this.currentRouter = this.$route.path;
 		},

src/components/passwordChange.vue

@@ -14,11 +14,11 @@
 						</div>
 					</el-col>
 					<el-col :span="12">
-						<div style="margin-top: 50px;">
+						<div style="margin-top: 80px;">
 							<el-form :hide-required-asterisk="true" :model="passwordForm" :rules="rules" ref="passwordForm" label-width="100px" class="demo-ruleForm">
-								<el-form-item label="当前密码" prop="old">
-									<el-input v-model="passwordForm.old" placeholder="请输入当前密码"></el-input>
-								</el-form-item>
+								<!--<el-form-item label="当前密码" prop="old">-->
+									<!--<el-input v-model="passwordForm.old" placeholder="请输入当前密码"></el-input>-->
+								<!--</el-form-item>-->
 								<el-form-item label="新密码" prop="new">
 									<el-input v-model="passwordForm.new" placeholder="请输入新密码"></el-input>
 								</el-form-item>
@@ -46,13 +46,13 @@
 //import引入的组件需要注入到对象中才能使用
 		components: {},
 		data () {
-			let validateOld=(rule, value, callback)=>{
-				if (value !== this.userDetail.password) {
-					callback(new Error('密码错误，请重新输入！'));
-				} else{
-					callback();
-				}
-			};
+			// let validateOld=(rule, value, callback)=>{
+			// 	if (value !== this.userDetail.password) {
+			// 		callback(new Error('密码错误，请重新输入！'));
+			// 	} else{
+			// 		callback();
+			// 	}
+			// };
 			let validateNew = (rule, value, callback) => {
 				if (value === '') {
 					callback(new Error('请输入密码'));
@@ -88,19 +88,14 @@
 						// { required: true, message: '请输入新密码', trigger: 'blur' },
 					],
 					old: [
-						{ validator: validateOld, trigger: 'blur' }
-						// { required: true, message: '请输入当前密码', trigger: 'blur' },
+						// { validator: validateOld, trigger: 'blur' }
+						{ required: true, message: '请输入当前密码', trigger: 'blur' },
 					],
 					confirm: [
 						{ validator: validateConfirm, trigger: 'blur' }
 						// { required: true, message: '请输入确认密码', trigger: 'blur' },
 					],
 				},
-				closeDialog(val) {
-					console.log(val)
-					this.$refs[val].resetFields();
-					this.$emit('close', false);
-				},
 			};
 		},
 		props: {
@@ -123,13 +118,38 @@
 			passwordSubmit(val) {
 				this.$refs[val].validate((valid) => {
 					if (valid) {
-						alert('submit!');
+						let data = JSON.parse(this.$Base64.decode(localStorage.getItem('login')));
+						data.password = this.passwordForm.confirm;
+						this.$axios.putPassword(data).then((res) => {
+							console.log(res)
+							if (res.status === 200) {
+								this.$message({
+									message: '修改密码成功！',
+									type: 'success'
+								});
+								this.$emit('close', false);
+								let that = this;
+								setTimeout(function () {
+									that.$axios.getLogout().then(res => { // 登出
+										if (res.data.code === 200) {
+											that.$router.push({name: 'login'});
+											localStorage.clear();
+										}
+									})
+								}, 500)
+							}
+						})
 					} else {
 						console.log('error submit!!');
 						return false;
 					}
 				});
-			}
+			},
+			closeDialog(val) {
+				console.log(val)
+				this.$refs[val].resetFields();
+				this.$emit('close', false);
+			},
 		},
 //生命周期 - 创建完成（可以访问当前this实例）
 		created () {
@@ -138,7 +158,7 @@
 //生命周期 - 挂载完成（可以访问DOM元素）
 		mounted () {
 			this.userDetail = JSON.parse(this.$Base64.decode(localStorage.getItem('login')));
-			console.log(this.userDetail)
+			// console.log(this.userDetail)
 		},
 		beforeCreate () {
 		}, //生命周期 - 创建之前

src/utils/common.js

@@ -56,8 +56,10 @@ export default {
 			name = '待考评'
 		} else if (val === 'finished') {
 			name = '已完结'
-		} else {
+		} else if (val === 'delete'){
 			name = '已删除'
+		} else {
+			name = '';
 		}
 		return name;
 	},

src/views/AdminSetting.vue

@@ -2,18 +2,18 @@
 <template>
 	<div class='adminSetting'>
 		<ul class="userAuthority">
-			<li class="authority" @click="authorityClick('authorityManage')">
-				<div class="nameManage">权限管理</div>
+			<li class="person" @click="authorityClick('consumerManage')">
+				<div class="nameManage">用户管理</div>
 			</li>
 			<li class="department" @click="authorityClick('departmentManage')">
 				<div class="nameManage">部门管理</div>
 			</li>
+			<li class="authority" @click="authorityClick('authorityManage')">
+				<div class="nameManage">权限管理</div>
+			</li>
 			<li class="role" @click="authorityClick('roleManage')">
 				<div class="nameManage">角色管理</div>
 			</li>
-			<li class="person" @click="authorityClick('consumerManage')">
-				<div class="nameManage">用户管理</div>
-			</li>
 			<li class="params" @click="authorityClick('paramsSetting')">
 				<div class="nameManage">参数配置</div>
 			</li>

src/views/TaskDetails.vue

@@ -264,7 +264,7 @@
 					</el-form>
 					<div style="text-align: center;">
 						<el-button type="primary" @click="submitEvaDialog('evaForm')">确定</el-button>
-						<el-button type="primary" @click="closeEvaTaskDialog()">取消</el-button>
+						<!--<el-button type="primary" @click="closeEvaTaskDialog()">取消</el-button>-->
 					</div>
 				</div>
 			</el-dialog>
@@ -467,7 +467,17 @@
 									dataUser.push(...res.data.crewList);
 									console.log(dataUser)
 								}
-								let dataUser2 = Array.from(new Set(dataUser));
+								// console.log()
+								let dataUser2 = JSON.parse(JSON.stringify(dataUser));
+								for(let i = 0; i < dataUser2.length; i++) {
+									for(let j = i + 1; j < dataUser2.length ; j++) {
+										if(dataUser2[i].id === dataUser2[j].id) {
+											dataUser2.splice(j, 1)
+											j--;
+										}
+									}
+								}
+								// let dataUser2 = Array.from(new Set(dataUser));
 								this.leaderOptions = dataUser2;
 								this.memberOptions = dataUser2;
 							}