fix

virgo.wzfrontend/console/src/components/work/space/project/detail.vue

@@ -1,80 +1,84 @@
-<template>
-	<div class="hui-detail">
-		<div class="hui-detail-title">基础信息</div>
-		<div class="hui-detail-content">
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">项目名称</div>
-				<div class="hui-detail-value">{{detail.name}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">项目区域</div>
-				<div class="hui-detail-value">{{detail.address.join('-')}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">具体地点</div>
-				<div class="hui-detail-value">{{detail.specific}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">项目描述</div>
-				<div class="hui-detail-value">{{detail.comment}}</div>
-			</div>
-		</div>
-		<div class="hui-detail-title">项目标签</div>
-		<div class="hui-detail-content hui-detail-image">
-			<tag ref="tag" type="look" :tagType="1" :tagActive="detail.tagIds ? detail.tagIds.split(',') : []">
-			</tag>
-		</div>
-		<div class="hui-detail-title">项目图片</div>
-		<div class="hui-detail-content hui-detail-image">
-			<upload ref="upload" :list="detail.picture ? JSON.parse(detail.picture) : []" type="preview">
-			</upload>
-		</div>
-	</div>
-</template>
-
-<script>
-	import {
-		getProjectDetailById
-	} from '@/httpApi/space'
-	import upload from '@/components/common/upload'
-	import tag from '@/components/common/tag'
-	export default {
-		props: ['detailId'],
-		data() {
-			return {
-				detail: {
-					name: '', //项目名称
-					address: [],
-					comment: '',
-					data: '',
-					organizationId: '',
-					picture: '',
-					tagIds: ''
-				}
-			}
-		},
-		created() {
-			if (this.detailId) this.init();
-		},
-		components: {
-			upload,
-			tag
-		},
-		methods: {
-			init() {
-				getProjectDetailById(this.detailId).then(res => {
-					if (res.state) {
-						let obj = res.data;
-						let data = {};
-						if (obj.data) data = JSON.parse(obj.data);
-						obj.address = JSON.parse(obj.address);
-						this.detail = Object.assign(obj, data);
-					}
-				})
-			}
-		},
-	}
-</script>
-<style lang="scss">
-
+<template>
+	<div class="hui-detail">
+		<div class="hui-detail-title">基础信息</div>
+		<div class="hui-detail-content">
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">项目名称</div>
+				<div class="hui-detail-value">{{detail.name}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">项目类型</div>
+				<div class="hui-detail-value">{{$field.findTypeName('projectType',detail.type)}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">项目区域</div>
+				<div class="hui-detail-value">{{detail.address.join('-')}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">具体地点</div>
+				<div class="hui-detail-value">{{detail.specific}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">项目描述</div>
+				<div class="hui-detail-value">{{detail.comment}}</div>
+			</div>
+		</div>
+		<div class="hui-detail-title">项目标签</div>
+		<div class="hui-detail-content hui-detail-image">
+			<tag ref="tag" type="look" :tagType="1" :tagActive="detail.tagIds ? detail.tagIds.split(',') : []">
+			</tag>
+		</div>
+		<div class="hui-detail-title">项目图片</div>
+		<div class="hui-detail-content hui-detail-image">
+			<upload ref="upload" :list="detail.picture ? JSON.parse(detail.picture) : []" type="preview">
+			</upload>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		getProjectDetailById
+	} from '@/httpApi/space'
+	import upload from '@/components/common/upload'
+	import tag from '@/components/common/tag'
+	export default {
+		props: ['detailId'],
+		data() {
+			return {
+				detail: {
+					name: '', //项目名称
+					address: [],
+					comment: '',
+					data: '',
+					organizationId: '',
+					picture: '',
+					tagIds: ''
+				}
+			}
+		},
+		created() {
+			if (this.detailId) this.init();
+		},
+		components: {
+			upload,
+			tag
+		},
+		methods: {
+			init() {
+				getProjectDetailById(this.detailId).then(res => {
+					if (res.state) {
+						let obj = res.data;
+						let data = {};
+						if (obj.data) data = JSON.parse(obj.data);
+						obj.address = JSON.parse(obj.address);
+						this.detail = Object.assign(obj, data);
+					}
+				})
+			}
+		},
+	}
+</script>
+<style lang="scss">
+
 </style>

virgo.wzfrontend/console/src/components/work/space/project/edit.vue

@@ -1,114 +1,122 @@
-<template>
-	<div class="hui-flex hui-dialog">
-		<div class="hui-flex-box hui-dialog-content">
-			<el-form ref="projectForm" label-position="top" :model="projectForm">
-				<el-form-item label="项目名称" prop="name" :rules="[{required: true, message: '请输入项目名称'}]">
-					<el-input type="text" v-model="projectForm.name" placeholder="请输入项目名称"></el-input>
-				</el-form-item>
-				<el-form-item label="项目区域" prop="address" :rules="[{required: true, message: '请选择项目区域'}]">
-					<city v-model="projectForm.address"></city>
-				</el-form-item>
-				<el-form-item label="具体地点">
-					<el-input type="text" v-model="specific" placeholder="请输入具体地点">
-					</el-input>
-				</el-form-item>
-				<el-form-item label="项目描述" class="hui-textarea">
-					<el-input type="textarea" v-model="projectForm.comment" placeholder="请输入项目描述" resize="none">
-					</el-input>
-				</el-form-item>
-				<el-form-item label="项目配图" class="hui-textarea">
-					<upload ref="upload" :list="responsibility" type="insert"></upload>
-				</el-form-item>
-				<el-form-item label="项目标签" class="hui-textarea">
-					<tag ref="tag" type="insert" :tagType="1"
-						:tagActive="projectForm.tagIds ? projectForm.tagIds.split(',') : []">
-					</tag>
-				</el-form-item>
-			</el-form>
-		</div>
-		<div class="hui-dialog-submit">
-			<el-button size="medium" @click="$emit('callback')">取 消</el-button>
-			<el-button size="medium" type="primary" @click="submit">保 存</el-button>
-		</div>
-	</div>
-</template>
-
-<script>
-	import {
-		insertProject,
-		getProjectDetailById,
-		updateProject
-	} from '@/httpApi/space'
-	import upload from '@/components/common/upload'
-	import city from '@/components/common/city'
-	import tag from '@/components/common/tag'
-	export default {
-		props: ['isUpdate', 'detailId'],
-		data() {
-			return {
-				projectForm: {
-					name: '', //项目名称
-					address: [],
-					comment: '',
-					data: '',
-					organizationId: '',
-					picture: '',
-					tagIds: ''
-				},
-				specific: '',
-				responsibility: []
-			}
-		},
-		created() {
-			this.projectForm['organizationId'] = this.$store.getters.user.organization.id;
-			if (this.isUpdate) {
-				getProjectDetailById(this.detailId).then(res => {
-					if (res.state) {
-						this.projectForm = res.data;
-						this.projectForm.address = JSON.parse(this.projectForm.address);
-						if (this.projectForm.picture) this.responsibility = JSON.parse(this.projectForm.picture);
-						if (this.projectForm.data) {
-							let data = JSON.parse(this.projectForm.data);
-							this.specific = data.specific;
-						}
-					}
-				})
-			}
-		},
-		methods: {
-			submit() {
-				this.$refs.projectForm.validate((valid) => {
-					if (valid) {
-						let postData = JSON.parse(JSON.stringify(this.projectForm));
-						postData.data = JSON.stringify({
-							specific: this.specific
-						});
-						postData['picture'] = JSON.stringify(this.$refs.upload.fileList);
-						postData['address'] = JSON.stringify(this.projectForm.address);
-						postData['tagIds'] = this.$refs.tag.tagIds();
-						if (this.isUpdate) {
-							updateProject(postData).then(this.successFunc);
-						} else {
-							insertProject(postData).then(this.successFunc);
-						}
-					} else {
-						return false;
-					}
-				});
-			},
-			successFunc(res) {
-				if (res.state) {
-					this.$message.success('操作成功');
-					this.$emit('callback', 'init');
-				}
-			}
-		},
-		components: {
-			city,
-			upload,
-			tag
-		},
-	}
-</script>
-
+<template>
+	<div class="hui-flex hui-dialog">
+		<div class="hui-flex-box hui-dialog-content">
+			<el-form ref="projectForm" label-position="top" :model="projectForm">
+				<el-form-item label="项目名称" prop="name" :rules="[{required: true, message: '请输入项目名称'}]">
+					<el-input type="text" v-model="projectForm.name" placeholder="请输入项目名称"></el-input>
+				</el-form-item>
+				<el-form-item label="项目类型" prop="type" :rules="[{required: true, message: '请选择项目类型'}]">
+					<el-select v-model="projectForm.type" placeholder="请选择项目类型">
+						<el-option :label="item.name" :value="item.id" v-for="(item,index) in $field.field.projectType"
+							:key="item.id">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="项目区域" prop="address" :rules="[{required: true, message: '请选择项目区域'}]">
+					<city v-model="projectForm.address"></city>
+				</el-form-item>
+				<el-form-item label="具体地点">
+					<el-input type="text" v-model="specific" placeholder="请输入具体地点">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="项目描述" class="hui-textarea">
+					<el-input type="textarea" v-model="projectForm.comment" placeholder="请输入项目描述" resize="none">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="项目配图" class="hui-textarea">
+					<upload ref="upload" :list="responsibility" type="insert"></upload>
+				</el-form-item>
+				<el-form-item label="项目标签" class="hui-textarea">
+					<tag ref="tag" type="insert" :tagType="1"
+						:tagActive="projectForm.tagIds ? projectForm.tagIds.split(',') : []">
+					</tag>
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="hui-dialog-submit">
+			<el-button size="medium" @click="$emit('callback')">取 消</el-button>
+			<el-button size="medium" type="primary" @click="submit">保 存</el-button>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		insertProject,
+		getProjectDetailById,
+		updateProject
+	} from '@/httpApi/space'
+	import upload from '@/components/common/upload'
+	import city from '@/components/common/city'
+	import tag from '@/components/common/tag'
+	export default {
+		props: ['isUpdate', 'detailId'],
+		data() {
+			return {
+				projectForm: {
+					name: '', //项目名称
+					address: [],
+					comment: '',
+					data: '',
+					organizationId: '',
+					picture: '',
+					tagIds: '',
+					type: 1
+				},
+				specific: '',
+				responsibility: []
+			}
+		},
+		created() {
+			this.projectForm['organizationId'] = this.$store.getters.user.organization.id;
+			if (this.isUpdate) {
+				getProjectDetailById(this.detailId).then(res => {
+					if (res.state) {
+						this.projectForm = res.data;
+						this.projectForm.address = JSON.parse(this.projectForm.address);
+						if (this.projectForm.picture) this.responsibility = JSON.parse(this.projectForm.picture);
+						if (this.projectForm.data) {
+							let data = JSON.parse(this.projectForm.data);
+							this.specific = data.specific;
+						}
+					}
+				})
+			}
+		},
+		methods: {
+			submit() {
+				this.$refs.projectForm.validate((valid) => {
+					if (valid) {
+						let postData = JSON.parse(JSON.stringify(this.projectForm));
+						postData.data = JSON.stringify({
+							specific: this.specific
+						});
+						postData['picture'] = JSON.stringify(this.$refs.upload.fileList);
+						postData['address'] = JSON.stringify(this.projectForm.address);
+						postData['tagIds'] = this.$refs.tag.tagIds();
+						if (this.isUpdate) {
+							updateProject(postData).then(this.successFunc);
+						} else {
+							insertProject(postData).then(this.successFunc);
+						}
+					} else {
+						return false;
+					}
+				});
+			},
+			successFunc(res) {
+				if (res.state) {
+					this.$message.success('操作成功');
+					this.$emit('callback', 'init');
+				}
+			}
+		},
+		components: {
+			city,
+			upload,
+			tag
+		},
+	}
+</script>
+
 <style lang="scss"></style>

virgo.wzfrontend/console/src/layout/components/selectProject.vue

@@ -32,7 +32,8 @@
 				<el-table-column label="操作" width="100">
 					<template slot-scope="scope">
 						<div class="hui-table-operation">
-							<span class="table-operation" v-if="$store.getters.project.id != scope.row.projectId"
+							<span class="table-operation"
+								v-if="$store.getters.project.id != scope.row.projectId || $store.getters.identityId != scope.row.identityId"
 								@click="changeProject(scope.row)">
 								切换项目
 							</span>
@@ -61,6 +62,9 @@
 		getProjectDetailById,
 		getProjectListByPage
 	} from '@/httpApi/space'
+	import {
+		getIdentityResource
+	} from '@/httpApi/system'
 	import {
 		setComment
 	} from '@/uitls/auth';
@@ -81,7 +85,6 @@
 						this.tableData = res.data.dataList.map(node => {
 							let organization = user.organizationList.find(item => item.id === node
 								.organizationId);
-							console.log(organization);
 							return {
 								projectId: node.id,
 								projectName: node.name,
@@ -124,8 +127,13 @@
 														identityId: 6
 													}
 												})
-												this.tableData = clientData.concat(organizationData,
+												let list = clientData.concat(organizationData,
 													obj).sort((a, b) => a.projectId - b.projectId);
+												this.tableData = list.filter((item, index) => {
+													return list.findIndex(t => t.projectId ===
+														item.projectId && t.identityId ===
+														item.identityId) === index;
+												})
 											}
 										});
 								} else {
@@ -156,15 +164,39 @@
 								this.$store.dispatch('projectBase/changeProject', data);
 								localStorage.setItem('projectId', data.id);
 								this.$store.dispatch('app/changeUser', user);
-								this.$store.dispatch('app/changeMenuData', user.resource ? JSON.parse(user
-									.resource) : []);
-								setComment(user.menu ? user.menu : JSON.stringify([]));
-								this.$emit('callback');
-								this.$router.push({
-									path: '/',
-									replace: true
-								})
-								this.$message.success('切换成功');
+								if (item.identityId === 3 || user.userId === 1) {
+									this.$store.dispatch('app/changeMenuData', user.resource ? JSON.parse(
+										user.resource) : []);
+									setComment(user.menu ? user.menu : JSON.stringify([]));
+									this.$emit('callback');
+									this.$router.push({
+										path: '/',
+										replace: true
+									})
+									this.$message.success('切换成功');
+								} else {
+									getIdentityResource({
+										identityId: item.identityId,
+										type: data.type
+									}).then(node => {
+										if (node.state) {
+											let role = node.data[0] || {};
+											this.$store.dispatch('app/changeMenuData', role
+												.resource ? JSON.parse(role.resource) : []);
+											setComment(role.menus ? role.menus : JSON.stringify(
+												[]));
+											this.$emit('callback');
+											this.$router.push({
+												path: '/',
+												replace: true
+											})
+											this.$message.success('切换成功');
+										} else {
+											this.loginLoading = false;
+										}
+									})
+								}
+
 							} else {
 								this.$message.error('切换失败');
 							}

virgo.wzfrontend/console/src/views/login/index.vue

@@ -47,6 +47,9 @@
 	import {
 		getProjectDetailById
 	} from '@/httpApi/space'
+	import {
+		getIdentityResource
+	} from '@/httpApi/system'
 	import {
 		setToken,
 		setComment
@@ -160,14 +163,7 @@
 								this.selectOrganized(organized);
 								this.$store.dispatch('app/changeOrganization', organized);
 								this.$store.dispatch('app/changeUser', user);
-								if (user.projectId === -1) {
-									this.getUserProjectList();
-								} else {
-									this.selectProject({
-										projectId: user.projectId,
-										identityId: 6
-									})
-								}
+								this.getUserProjectList(user.projectId);
 							} else {
 								this.loginLoading = false;
 							}
@@ -181,7 +177,7 @@
 				let organized = !data.organization ? data.organizationList[0] : data.organization;
 				return organized;
 			},
-			getUserProjectList() {
+			getUserProjectList(projectId) {
 				bindProjectDetail({
 					userId: this.$store.getters.user.userId
 				}).then(res => {
@@ -213,6 +209,7 @@
 										}
 										let projectList = clientData.concat(organizationData, obj)
 											.sort((a, b) => a.projectId - b.projectId);
+										console.log(projectList);
 										if (projectList.length === 0) {
 											this.loginLoading = false;
 											this.$store.dispatch('app/changeMenuData', []);
@@ -223,7 +220,12 @@
 											this.$message.success('登录成功');
 											return this.$router.push('/space/project');
 										} else {
-											this.selectProject(projectList[0])
+											if (projectId === -1) {
+												this.selectProject(projectList[0]);
+											} else {
+												this.selectProject(projectList.filter(project =>
+													project.projectId === projectId)[0]);
+											}
 										}
 									} else {
 										this.loginLoading = false;
@@ -249,12 +251,32 @@
 								this.$store.dispatch('projectBase/changeProject', data);
 								localStorage.setItem('projectId', data.id);
 								this.$store.dispatch('app/changeUser', user);
-								this.$store.dispatch('app/changeMenuData', user.resource ? JSON.parse(user
-									.resource) : []);
-								setComment(user.menu ? user.menu : JSON.stringify([]));
-								this.loginLoading = false;
-								this.$router.push('/');
-								this.$message.success('登录成功');
+								if (item.identityId === 3 || user.userId === 1) {
+									this.$store.dispatch('app/changeMenuData', user.resource ? JSON.parse(
+										user.resource) : []);
+									setComment(user.menu ? user.menu : JSON.stringify([]));
+									this.loginLoading = false;
+									this.$router.push('/');
+									this.$message.success('登录成功');
+								} else {
+									getIdentityResource({
+										identityId: item.identityId,
+										type: data.type
+									}).then(node => {
+										if (node.state) {
+											let role = node.data[0] || {};
+											this.$store.dispatch('app/changeMenuData', role
+												.resource ? JSON.parse(role.resource) : []);
+											setComment(role.menus ? role.menus : JSON.stringify(
+												[]));
+											this.loginLoading = false;
+											this.$router.push('/');
+											this.$message.success('登录成功');
+										} else {
+											this.loginLoading = false;
+										}
+									})
+								}
 							} else {
 								this.loginLoading = false;
 							}

virgo.wzfrontend/console/src/views/work/space/project.vue

@@ -15,6 +15,11 @@
 						</template>
 					</el-table-column>
 					<el-table-column label="项目名称" prop="name"></el-table-column>
+					<el-table-column label="项目类型" prop="name">
+						<template slot-scope="scope">
+							<span>{{$field.findTypeName('projectType',scope.row.type)}}</span>
+						</template>
+					</el-table-column>
 					<el-table-column label="项目描述" prop="comment"></el-table-column>
 					<el-table-column label="操作" width="150">
 						<template slot-scope="scope">
@@ -50,6 +55,9 @@
 		getProjectListByPage,
 		deleteProjectById
 	} from '@/httpApi/space'
+	import {
+		getIdentityResource
+	} from '@/httpApi/system'
 	import edit from '@/components/work/space/project/edit'
 	import detail from '@/components/work/space/project/detail'
 	import {
@@ -100,9 +108,18 @@
 						let user = res.data;
 						localStorage.setItem('projectId', data.id);
 						this.$store.dispatch('app/changeUser', user);
-						this.$store.dispatch('app/changeMenuData', user.resource ? JSON.parse(user.resource) : []);
-						setComment(user.menu ? user.menu : JSON.stringify([]));
 						this.$store.dispatch('projectBase/changeProject', data);
+						getIdentityResource({
+							identityId: 6,
+							type: data.type
+						}).then(node => {
+							if (node.state) {
+								let role = node.data[0] || {};
+								this.$store.dispatch('app/changeMenuData', role
+									.resource ? JSON.parse(role.resource) : []);
+								setComment(role.menus ? role.menus : JSON.stringify([]));
+							}
+						})
 					}
 				});
 			},