fix

virgo.wzfrontend/console/src/components/common/tag.vue

@@ -18,7 +18,8 @@
 		getTagList,
 		insertTag,
 		updateTag,
-		deleteTag
+		deleteTag,
+		getTagListByOrganizationId
 	} from '@/httpApi/space'
 	export default {
 		name: 'tag',
@@ -50,7 +51,7 @@
 		},
 		methods: {
 			init() {
-				getTagList(this.tagType).then(res => {
+				getTagListByOrganizationId(this.$store.getters.organization.id, this.tagType).then(res => {
 					if (res.state) {
 						this.dataBox = res.data;
 						this.initTagList();
@@ -79,7 +80,8 @@
 				}) => {
 					insertTag({
 						type: this.tagType,
-						name: value
+						name: value,
+						organizationId: this.$store.getters.organization.id
 					}).then(res => {
 						if (res.state) {
 							this.init();

virgo.wzfrontend/console/src/httpApi/space.js

@@ -171,6 +171,17 @@ export function getTagList(type) {
 		method: 'post'
 	})
 }
+/* 
+ * 获取组织标签列表
+ * 
+ * 
+ */
+export function getTagListByOrganizationId(organizationId, type) {
+	return request({
+		url: `/api/tag/${organizationId}/${type}`,
+		method: 'get'
+	})
+}
 /* 
  * 新增标签
  * 

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

@@ -57,8 +57,7 @@
 		methods: {
 			submit() {
 				this.userForm['id'] = this.userForm.userId;
-				this.userForm['portrait'] = this.$refs.image.fileList.length === 0 ?
-					'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3156449b8a1a4874981b2a76d5947721' : this.$refs
+				if (this.$refs.image.fileList.length > 0) this.userForm['portrait'] = this.$refs
 					.image.fileList[0].url;
 				updateUserDetails(this.userForm).then(res => {
 					if (res.state) {

virgo.wzfrontend/console/src/uitls/permission.js

@@ -14,7 +14,7 @@ import Vue from 'vue'
 NProgress.configure({
 	showSpinner: false
 })
-const baseUrl = ['/', '/401', '/404', '/loginRegister/login', '/message'];
+const baseUrl = ['/', '/401', '/404', '/loginRegister/login', '/message', '/space/project'];
 
 const testBaseUrl = (path) => { //判断公共路由
 	let nowBaseUrl = ['/loginRegister/login'].filter((item) => {

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

@@ -1,149 +1,149 @@
-<template>
-	<div class="hui-flex hui-content">
-		<div class="hui-content-title">
-			<div class="hui-title-item active">项目列表</div>
-		</div>
-		<div class="hui-flex-box hui-flex hui-table">
-			<div class="hui-content-insert">
-				<el-button type="primary" size="medium" @click="insertProject">新增项目</el-button>
-			</div>
-			<div class="hui-flex-box">
-				<el-table :data="tableData" row-key="id" border height="100%">
-					<el-table-column label="序号" width="50">
-						<template slot-scope="scope">
-							<div style="text-align: center;">{{scope.$index + 1}}</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="项目名称" prop="name"></el-table-column>
-					<el-table-column label="项目描述" prop="comment"></el-table-column>
-					<el-table-column label="操作" width="150">
-						<template slot-scope="scope">
-							<div class="hui-table-operation">
-								<span class="table-operation" @click="lookProject(scope.row)">详情</span>
-								<span class="table-operation" @click="updateProject(scope.row)">编辑</span>
-								<span class="table-operation" @click="deleteProject(scope.row)">删除</span>
-							</div>
-						</template>
-					</el-table-column>
-					<template slot="empty">
-						<empty description="暂无数据"></empty>
-					</template>
-				</el-table>
-			</div>
-			<div class="hui-content-pagination">
-				<el-pagination :page-size="pageSize" :pager-count="9" layout="prev, pager, next" :total="totalCount"
-					@current-change="currentChange">
-				</el-pagination>
-			</div>
-		</div>
-		<el-dialog :title="isUpdate?'编辑':'新增'" :visible.sync="visible" width="900px" :append-to-body="true">
-			<edit v-if="visible" @callback="callback" :isUpdate="isUpdate" :detailId="detailId"></edit>
-		</el-dialog>
-		<el-drawer title="项目详情" :visible.sync="drawer" :size="400" :append-to-body="true">
-			<detail v-if="drawer" :detailId="detailId"></detail>
-		</el-drawer>
-	</div>
-</template>
-
-<script>
-	import {
-		getProjectListByPage,
-		deleteProjectById
-	} from '@/httpApi/space'
-	import edit from '@/components/work/space/project/edit'
-	import detail from '@/components/work/space/project/detail'
-	import {
-		selectProject
-	} from '@/httpApi/loginRegister'
-	import {
-		setComment
-	} from '@/uitls/auth';
-	export default {
-		data() {
-			return {
-				tableData: [],
-				currPage: 1,
-				pageSize: 10,
-				totalCount: 0,
-				visible: false,
-				detailId: '',
-				isUpdate: false,
-				drawer: false
-			}
-		},
-		created() {
-			this.init();
-		},
-		methods: {
-			init() {
-				getProjectListByPage({
-					currPage: this.currPage,
-					pageSize: this.pageSize,
-					organizationId: this.$store.getters.organization.id
-				}).then(res => {
-					if (res.state) {
-						this.tableData = res.data.dataList;
-						this.totalCount = res.data.totalCount;
-						if (this.$store.getters.project.id) return;
-						this.changeProject(this.tableData[0]);
-					}
-				})
-			},
-			changeProject(data) {
-				if (!data) return;
-				data.projectItemList = data.projectItemList || [];
-				data.projectItemList.sort((a, b) => {
-					return a.id - b.id;
-				});
-				selectProject(data.id).then(res => {
-					if (res.state) {
-						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);
-					}
-				});
-			},
-			currentChange(currPage) {
-				this.currPage = currPage;
-				this.init();
-			},
-			insertProject() {
-				this.isUpdate = false;
-				this.visible = true;
-			},
-			updateProject(val) {
-				this.detailId = val.id;
-				this.isUpdate = true;
-				this.visible = true;
-			},
-			lookProject(val) {
-				this.detailId = val.id;
-				this.drawer = true;
-			},
-			deleteProject(val) {
-				if (this.$store.getters.project.id === val.id) return this.$message.warning('不能删除当前项目，请切换项目后删除');
-				this.$confirm('确定要删除该项目?', () => {
-					deleteProjectById(val.id).then(res => {
-						if (res.state) {
-							this.init();
-							this.$message.success('操作成功');
-						}
-					})
-				});
-			},
-			callback(type) {
-				if (type === 'init') this.init();
-				this.visible = false;
-			}
-		},
-		components: {
-			edit,
-			detail
-		},
-	}
-</script>
-
+<template>
+	<div class="hui-flex hui-content">
+		<div class="hui-content-title">
+			<div class="hui-title-item active">项目列表</div>
+		</div>
+		<div class="hui-flex-box hui-flex hui-table">
+			<div class="hui-content-insert">
+				<el-button type="primary" size="medium" @click="insertProject">新增项目</el-button>
+			</div>
+			<div class="hui-flex-box">
+				<el-table :data="tableData" row-key="id" border height="100%">
+					<el-table-column label="序号" width="50">
+						<template slot-scope="scope">
+							<div style="text-align: center;">{{scope.$index + 1}}</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="项目名称" prop="name"></el-table-column>
+					<el-table-column label="项目描述" prop="comment"></el-table-column>
+					<el-table-column label="操作" width="150">
+						<template slot-scope="scope">
+							<div class="hui-table-operation">
+								<span class="table-operation" @click="lookProject(scope.row)">详情</span>
+								<span class="table-operation" @click="updateProject(scope.row)">编辑</span>
+								<span class="table-operation" @click="deleteProject(scope.row)">删除</span>
+							</div>
+						</template>
+					</el-table-column>
+					<template slot="empty">
+						<empty description="暂无数据"></empty>
+					</template>
+				</el-table>
+			</div>
+			<div class="hui-content-pagination">
+				<el-pagination :page-size="pageSize" :pager-count="9" layout="prev, pager, next" :total="totalCount"
+					@current-change="currentChange">
+				</el-pagination>
+			</div>
+		</div>
+		<el-dialog :title="isUpdate?'编辑':'新增'" :visible.sync="visible" width="900px" :append-to-body="true">
+			<edit v-if="visible" @callback="callback" :isUpdate="isUpdate" :detailId="detailId"></edit>
+		</el-dialog>
+		<el-drawer title="项目详情" :visible.sync="drawer" :size="400" :append-to-body="true">
+			<detail v-if="drawer" :detailId="detailId"></detail>
+		</el-drawer>
+	</div>
+</template>
+
+<script>
+	import {
+		getProjectListByPage,
+		deleteProjectById
+	} from '@/httpApi/space'
+	import edit from '@/components/work/space/project/edit'
+	import detail from '@/components/work/space/project/detail'
+	import {
+		selectProject
+	} from '@/httpApi/loginRegister'
+	import {
+		setComment
+	} from '@/uitls/auth';
+	export default {
+		data() {
+			return {
+				tableData: [],
+				currPage: 1,
+				pageSize: 10,
+				totalCount: 0,
+				visible: false,
+				detailId: '',
+				isUpdate: false,
+				drawer: false
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init() {
+				getProjectListByPage({
+					currPage: this.currPage,
+					pageSize: this.pageSize,
+					organizationId: this.$store.getters.organization.id
+				}).then(res => {
+					if (res.state) {
+						this.tableData = res.data.dataList;
+						this.totalCount = res.data.totalCount;
+						if (this.$store.getters.project.id) return;
+						if (this.tableData.length > 0) this.changeProject(this.tableData[0]);
+					}
+				})
+			},
+			changeProject(data) {
+				if (!data) return;
+				data.projectItemList = data.projectItemList || [];
+				data.projectItemList.sort((a, b) => {
+					return a.id - b.id;
+				});
+				selectProject(data.id).then(res => {
+					if (res.state) {
+						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);
+					}
+				});
+			},
+			currentChange(currPage) {
+				this.currPage = currPage;
+				this.init();
+			},
+			insertProject() {
+				this.isUpdate = false;
+				this.visible = true;
+			},
+			updateProject(val) {
+				this.detailId = val.id;
+				this.isUpdate = true;
+				this.visible = true;
+			},
+			lookProject(val) {
+				this.detailId = val.id;
+				this.drawer = true;
+			},
+			deleteProject(val) {
+				if (this.$store.getters.project.id === val.id) return this.$message.warning('不能删除当前项目，请切换项目后删除');
+				this.$confirm('确定要删除该项目?', () => {
+					deleteProjectById(val.id).then(res => {
+						if (res.state) {
+							this.init();
+							this.$message.success('操作成功');
+						}
+					})
+				});
+			},
+			callback(type) {
+				if (type === 'init') this.init();
+				this.visible = false;
+			}
+		},
+		components: {
+			edit,
+			detail
+		},
+	}
+</script>
+
 <style lang="scss"></style>