修改

src/axios/axios.js

@@ -28,9 +28,10 @@ axios.interceptors.response.use(function (response) {
   return response;
 }, function (error) {
   if (error.response !== undefined) {
-    console.log(error.response.status)
+    // console.log(error.response.status)
     if (error.response.status === 403) { // 错误处理
       router.push({name: 'login', params: {data: 'axios'}});
+      localStorage.clear();
       // window.location.reload();
     }
   }

src/axios/index.js

-let baseUrl = "https://workbook.zjtys.com.cn"; // 120.55.57.35 localhost 8289
+let baseUrl = "https://workbook.zjtys.com.cn:8289"; // 120.55.57.35 localhost 8289
 let env = process.env.VUE_APP_TITLE === 'alpha' ? 'alpha' : 'production';
 switch (env) {
   case 'production':
     // baseUrl = "http://192.168.1.248:8090"; // 测试环境
-		baseUrl = "https://workbook.zjtys.com.cn"; // 测试环境
+		baseUrl = "https://workbook.zjtys.com.cn:8289"; // 测试环境
     break;
   case 'alpha':
     // baseUrl = "https://workbook.zjtys.com.cn"; // 阿里云环境
-		baseUrl = "https://workbook.zjtys.com.cn"; // 阿里云环境
+		baseUrl = "https://workbook.zjtys.com.cn:8289"; // 阿里云环境
     break;
 }
 // https://workbook.zjtys.com.cn:8289

src/components/headerDetail.vue

@@ -78,6 +78,7 @@
 					this.$axios.getLogout().then(res => { // 登出
 						if (res.data.code === 200) {
 							this.$router.push({name: 'login'});
+							localStorage.clear();
 							// setTimeout(function () {
 							// 	window.location.reload();
 							// }, 500)

src/components/mainBreadcrumb.vue

@@ -8,6 +8,7 @@
 			<el-breadcrumb-item v-if="currentRouter === '/taskManage' || currentRouter === '/addTask' || currentRouter === '/viewTask'" :to="{ path: '/taskManage' }">任务管理</el-breadcrumb-item>
 			<el-breadcrumb-item v-if="currentRouter === '/addTask'" >新建任务</el-breadcrumb-item>
 			<el-breadcrumb-item v-if="currentRouter === '/viewTask' || currentRouter === '/taskDetails' || currentRouter === '/unpublishedTask'" :to="{ path: '/viewTask' }">查看任务</el-breadcrumb-item>
+			<el-breadcrumb-item v-if="currentRouter === '/departmentTask'" :to="{ path: '/departmentTask' }">部门任务</el-breadcrumb-item>
 			<el-breadcrumb-item v-if="currentRouter === '/unpublishedTask'" >未发布任务</el-breadcrumb-item>
 			<el-breadcrumb-item v-if="currentRouter === '/taskDetails'" >任务详情</el-breadcrumb-item>
 

src/router/index.js

@@ -79,11 +79,17 @@ const routes = [
 				meta: ['user'],
 				component: () => import(/* webpackChunkName: "home" */ '../views/PersonManage.vue')
 			},
+			{
+				path: '/personDetails',
+				name: 'personDetails',
+				meta: ['user'],
+				component: () => import(/* webpackChunkName: "home" */ '../views/PersonDetails.vue')
+			},
 			{
 				path: '/personInfo',
 				name: 'personInfo',
 				meta: ['user'],
-				component: () => import(/* webpackChunkName: "home" */ '../views/PersonDetails.vue')
+				component: () => import(/* webpackChunkName: "home" */ '../views/PersonInfo.vue')
 			},
 			{
 				path: '/personList',
@@ -158,43 +164,47 @@ const router = new VueRouter({
   routes
 })
 
-// router.beforeEach((to, from, next) => {
-// 	if (to.path === '/login') {
-// 		next();
-// 	} else {
-// 		let role = JSON.parse(base64.decode(localStorage.getItem('login')));
-// 		if (JSON.stringify(role) === '') {
-// 			next('/');
-// 		} else {
-// 			// console.log(to)
-// 			let data;
-// 			if (role.username !== 'root') {
-// 				data = 'user';
-// 			} else {
-// 				data = 'root';
-// 			}
-// 			for (let i = 0; i < to.meta.length; i++) {
-// 				// console.log(to.meta[i]);
-// 				if (data === to.meta[i]) {
-// 					next();
-// 					break;
-// 				} else if (i === to.meta.length - 1) {
-// 					// next({
-// 					// 	path: '/login'
-// 					// })
-// 					break;
-// 				} else {
-// 					next('/');
-// 					break;
-// 				}
-// 			}
-// 			// if(to.matched.some(item => item.meta === data)) {
-// 			//
-// 			// } else {
-// 			// 	next('/');
-// 			// }
-// 		}
-// 	}
-// });
+router.beforeEach((to, from, next) => {
+	if (to.path === '/login') {
+		next();
+	} else {
+		if (localStorage.getItem('login') !== null) {
+			let role = JSON.parse(base64.decode(localStorage.getItem('login')));
+			if (JSON.stringify(role) === '') {
+				next('/');
+			} else {
+				// console.log(to)
+				let data;
+				if (role.username !== 'root') {
+					data = 'user';
+				} else {
+					data = 'root';
+				}
+				for (let i = 0; i < to.meta.length; i++) {
+					// console.log(to.meta[i]);
+					if (data === to.meta[i]) {
+						next();
+						break;
+					} else if (i === to.meta.length - 1) {
+						// next({
+						// 	path: '/login'
+						// })
+						break;
+					} else {
+						next('/');
+						break;
+					}
+				}
+				// if(to.matched.some(item => item.meta === data)) {
+				//
+				// } else {
+				// 	next('/');
+				// }
+			}
+		} else {
+			next('/');
+		}
+	}
+});
 
 export default router

src/views/AddTask.vue

@@ -27,7 +27,7 @@
 					</el-col>
 					<el-col :span="8">
 						<el-form-item label="任务开始时间" prop="stateTime">
-							<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" type="datetime" :picker-options="startOption" placeholder="选择日期" v-model="taskForm.stateTime" style="width: 100%;"></el-date-picker>
+							<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期" v-model="taskForm.stateTime" style="width: 100%;"></el-date-picker>
 						</el-form-item>
 						<el-form-item label="组员">
 							<!--prop="crewList"-->
@@ -44,7 +44,7 @@
 					</el-col>
 					<el-col :span="8">
 						<el-form-item label="预计完成时间" prop="completeTime">
-							<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" type="datetime" :picker-options="completeOption" placeholder="选择日期" v-model="taskForm.completeTime" style="width: 100%;"></el-date-picker>
+							<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期" v-model="taskForm.completeTime" style="width: 100%;"></el-date-picker>
 						</el-form-item>
 						<el-form-item label="任务量(天)" prop="workload">
 							<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'')" v-model="taskForm.workload"></el-input>
@@ -110,30 +110,6 @@
 					workloadCount: 1
 				},
 				announcer: '',
-				startOption: {
-					// disabledDate: time => {
-					// 	if (this.taskForm.completeTime) {
-					// 		return (
-					// 			time.getTime() > new Date(this.taskForm.completeTime).getTime()
-					// 		)
-					// 	} else {
-					// 		// 不能大于当前日期
-					// 		return time.getTime() > Date.now()
-					// 	}
-					// }
-				},
-				completeOption: {
-					// disabledDate: time => {
-					// 	if (this.taskForm.startTime) {
-					// 		return (
-					// 			time.getTime() > Date.now() ||
-					// 			time.getTime() < new Date(this.taskForm.startTime).getTime() + 8.64e7 // 加- 8.64e7则表示包当天
-					// 		)
-					// 	} else {
-					// 		return time.getTime() < Date.now()
-					// 	}
-					// }
-				},
 				rules: {
 					title: [
 						{ required: true, message: '请输入任务名称', trigger: 'blur' },
@@ -181,25 +157,41 @@
 					if (res.request.status === 200) {
 						if (res.data.length === 0 && (JSON.stringify(this.$store.getters.getSuperior.superior) !== '{}' && JSON.stringify(this.$store.getters.getSuperior.superior) !== undefined)) {
 							let data = this.$store.getters.getSuperior.superior.crewList;
-							data.push(JSON.parse(JSON.stringify(this.userLoginData)));
-							console.log(data)
-							let data2 = Array.from(new Set(data));
-							this.leaderOptions = data2;
-							this.memberOptions = data2;
+							if (data.findIndex(item => item.id === this.userLoginData.id) > -1) {
+								this.leaderOptions = data;
+								this.memberOptions = data;
+							} else {
+								data.push(JSON.parse(JSON.stringify(this.userLoginData)));
+								console.log(data)
+								let data2 = Array.from(new Set(data));
+								this.leaderOptions = data2;
+								this.memberOptions = data2;
+							}
 						} else if (res.data.length > 0 && (JSON.stringify(this.$store.getters.getSuperior.superior) === '{}' || JSON.stringify(this.$store.getters.getSuperior.superior) === undefined)) {
 							let data = res.data;
-							data.push(JSON.parse(JSON.stringify(this.userLoginData)));
-							let data2 = Array.from(new Set(data));
-							this.leaderOptions = data2;
-							this.memberOptions = data2;
+							if (data.findIndex(item => item.id === this.userLoginData.id) > -1) {
+								this.leaderOptions = data;
+								this.memberOptions = data;
+							} else {
+								data.push(JSON.parse(JSON.stringify(this.userLoginData)));
+								let data2 = Array.from(new Set(data));
+								this.leaderOptions = data2;
+								this.memberOptions = data2;
+							}
 						} else if (res.data.length > 0 && (JSON.stringify(this.$store.getters.getSuperior.superior) !== '{}' && JSON.stringify(this.$store.getters.getSuperior.superior) !== undefined)) {
 							let arr1 = res.data;
 							let arr2 = this.$store.getters.getSuperior.superior.crewList;
 							arr1.push(...arr2);
-							arr1.push(JSON.parse(JSON.stringify(this.userLoginData)));
-							let arr3 = Array.from(new Set(arr1));
-							this.leaderOptions = arr3;
-							this.memberOptions = arr3;
+							if (arr1.findIndex(item => item.id === this.userLoginData.id) > -1) {
+								let arr3 = Array.from(new Set(arr1));
+								this.leaderOptions = arr3;
+								this.memberOptions = arr3;
+							} else {
+								arr1.push(JSON.parse(JSON.stringify(this.userLoginData)));
+								let arr3 = Array.from(new Set(arr1));
+								this.leaderOptions = arr3;
+								this.memberOptions = arr3;
+							}
 						}
 					}
 				})
@@ -253,6 +245,13 @@
 					arr.push(v.id);
 				})
 				console.log(arr)
+				if (new Date(data.stateTime).getTime() > new Date(data.completeTime).getTime()) {
+					this.$message({
+						message: '任务开始时间不能大于预计完成时间',
+						type: 'warning'
+					});
+					return false;
+				}
 				data.workCoefficient = 0;
 				data.content = this.content;
 				data.pworkload = 1;

src/views/PersonInfo.vue

+<!-- 人员信息 -->
+<template>
+	<div class='personInfo'>
+		<div style="">
+			<el-row :gutter="20">
+				<el-col :span="5">
+					<div class="leftImg">
+						<img src="../assets/images/xq-tx-1.png"/>
+						<!--<img src="../assets/images/xq-tx-2.png"/>-->
+					</div>
+				</el-col>
+				<el-col :span="19">
+					<div>
+						<el-form :hide-required-asterisk="true" :model="userForm" :rules="rules" ref="userForm" label-width="100px" class="demo-ruleForm">
+							<el-row :gutter="10">
+								<el-col :span="8">
+									<el-form-item class="first" label="姓名">
+										<div>{{userForm.username}}</div>
+									</el-form-item>
+									<el-form-item class="first" label="身份证">
+										<div>{{userForm.idCard}}</div>
+									</el-form-item>
+									<el-form-item class="first" prop="email" label="邮箱">
+										<div>{{userForm.email}}</div>
+									</el-form-item>
+								</el-col>
+								<el-col :span="8">
+									<el-form-item class="first" label="电话1" prop="phone1">
+										<div>{{userForm.phone1}}</div>
+									</el-form-item>
+									<el-form-item class="first" label="地址" prop="address">
+										<div>{{userForm.address}}</div>
+									</el-form-item>
+									<!--<el-form-item class="first" label="部门2" prop="department2">-->
+									<!--<div>{{userForm.department2}}</div>-->
+									<!--</el-form-item>-->
+								</el-col>
+								<el-col :span="8">
+									<el-form-item class="first" label="电话2" prop="phone2">
+										<div>{{userForm.phone2}}</div>
+									</el-form-item>
+									<el-form-item class="first" label="入职时间" >
+										<div>{{userForm.entryTime}}</div>
+									</el-form-item>
+								</el-col>
+							</el-row>
+							<div class="roleDiv first" style="width: 100%;">
+								<el-form-item class="first" label="部门">
+									<span class="deSpan">{{nameDepartment(userForm.departmentIds)}}</span>
+								</el-form-item>
+								<el-form-item class="first" label="岗位">
+									<div>{{userForm.jobs}}</div>
+								</el-form-item>
+								<el-form-item label="角色" >
+									<span class="roleSpan" v-for="(items, index) in userForm.roles" :key="index">{{items.name}}</span>
+								</el-form-item>
+							</div>
+						</el-form>
+					</div>
+				</el-col>
+			</el-row>
+		</div>
+	</div>
+</template>
+
+<script>
+	//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
+	//例如：import 《组件名称》 from '《组件路径》';
+
+	export default {
+		name: "personInfo",
+//import引入的组件需要注入到对象中才能使用
+		components: {},
+		data () {
+//这里存放数据
+			return {
+				paramsData: '',
+				userForm:{
+					username: '',
+					phone1: '',
+					phone2: '',
+					idCard: '',
+					address: '',
+					jobs: '',
+					departmentIds: '',
+					// department2: '',
+					// department3: '',
+					email: '',
+					entryTime: '',
+				},
+				rules:{
+				},
+				deOptions: []
+			};
+		},
+//监听属性 类似于data概念
+		computed: {},
+//监控data中的数据变化
+		watch: {},
+//方法集合
+		methods: {
+			postDepartmentList() {
+				this.$axios.getAllDepartment().then((res) => {
+					console.log(res)
+					if (res.request.status === 200) {
+						this.deOptions = res.data;
+					}
+				})
+			},
+			nameDepartment(val) {
+				console.log(val)
+				let name = '';
+				console.log(this.deOptions)
+				for ( let i = 0; i < this.deOptions.length; i++ ) {
+					for (let j = 0; j < val.length; j++) {
+						if (this.deOptions[i].id === val[j]) {
+							name = name + this.deOptions[i].name + '、';
+						}
+					}
+				}
+				name = name.substring(0, name.length - 1);
+				console.log(name);
+				return name;
+			},
+		},
+//生命周期 - 创建完成（可以访问当前this实例）
+		created () {
+
+		},
+//生命周期 - 挂载完成（可以访问DOM元素）
+		mounted () {
+			this.postDepartmentList();
+			let that = this;
+			setTimeout(function () {
+				let data = JSON.parse(that.$Base64.decode(localStorage.getItem('infoPerson')));
+				console.log(data)
+				that.userForm = data;
+			}, 300)
+		},
+		beforeCreate () {
+		}, //生命周期 - 创建之前
+		beforeMount () {
+		}, //生命周期 - 挂载之前
+		beforeUpdate () {
+		}, //生命周期 - 更新之前
+		updated () {
+		}, //生命周期 - 更新之后
+		beforeDestroy () {
+		}, //生命周期 - 销毁之前
+		destroyed () {
+		}, //生命周期 - 销毁完成
+		activated () {
+		}, //如果页面有keep-alive缓存功能，这个函数会触发
+	}
+</script>
+<style scoped>
+</style>

src/views/PersonList.vue

@@ -114,8 +114,8 @@
 			},
 			handleClick(val) {
 				console.log(val)
-				// localStorage.setItem('infoPerson', this.$Base64.decode(localStorage.getItem('info')));
-				this.$router.push({name: 'viewTask'});
+				localStorage.setItem('infoPerson', this.$Base64.encode(JSON.stringify(val)));
+				this.$router.push({name: 'personInfo'});
 			},
 			getSelectDepartment() {
 				console.log(this.currentUser);

src/views/PersonManage.vue

@@ -2,7 +2,7 @@
 <template>
 	<div class='personManage'>
 		<ul class="userAuthority">
-			<li class="personInfo" @click="personClick('personInfo')">
+			<li class="personInfo" @click="personClick('personDetails')">
 				<div class="nameManage">个人信息</div>
 			</li>
 			<li class="personList" @click="personClick('personList')">

src/views/UnpublishedTask.vue

@@ -199,9 +199,11 @@
 							this.attachmentsArr.push(obj)
 						})
 						let arr = [];
-						res.data.crewList.forEach((v,i)=> {
-							arr.push(v.id);
-						})
+						if (res.data.crewList !== null) {
+							res.data.crewList.forEach((v,i)=> {
+								arr.push(v.id);
+							})
+						}
 						this.taskForm.crewList = arr;
 					}
 				})