fix

virgo.wzfrontend/console/src/components/datacenter/folderForm.vue

@@ -6,12 +6,12 @@
 					<el-input type="text" v-model="setData.name" placeholder="文件夹名称" :disabled="!setData.directory">
 					</el-input>
 				</el-form-item>
-				<el-form-item label="访问权限" v-if="!isUpdate">
+				<el-form-item label="访问权限" v-if="!isUpdate || type === 'organization'">
 					<el-radio v-model="setData.permissions" label="1">公开</el-radio>
 					<el-radio v-model="setData.permissions" label="2">私密</el-radio>
 					<el-radio v-model="setData.permissions" v-if="type === 'organization'" label="3">密码</el-radio>
 				</el-form-item>
-				<el-form-item label="访问密码" v-if="!isUpdate && setData.permissions == 3">
+				<el-form-item label="访问密码" v-if="(!isUpdate && setData.permissions == 3) || (type === 'organization' && setData.permissions == 3)">
 					<el-input type="text" v-model="setData.password" placeholder="访问密码"></el-input>
 				</el-form-item>
 			</el-form>

virgo.wzfrontend/console/src/components/datacenter/setPermission.vue

@@ -38,11 +38,11 @@
 			}
 		},
 		created() {
-			this.setData['permissions'] = this.detail.permissions;
+			this.setData['permissions'] = this.detail.permissions || '1';
 			getProjectPermissionDetail(this.detail.id, -1).then(res => {
 				if (res.state) {
 					this.setData = res.data || {
-						permissions: this.detail.permissions,
+						permissions: this.detail.permissions || '1',
 						password: ''
 					};
 				}
@@ -51,7 +51,7 @@
 		methods: {
 			submit() {
 				this.setData.id ? updateProjectPermission(this.setData).then(this.successFunc) : insertProjectPermission({
-					fileNodeProjectId: this.detailId,
+					fileNodeProjectId: this.detail.id,
 					organizationId: -1,
 					password: this.setData.password,
 					permissions: this.setData.permissions

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

@@ -75,6 +75,16 @@ export function selectProject(projectId) {
 		method: 'put',
 	})
 }
+/* 
+ * 切换身份
+ * @param null 
+ */
+export function selectIdentity(identityId) {
+	return request({
+		url: `/manager/userContext/identity/${identityId}`,
+		method: 'put'
+	})
+}
 /* 
  * 根据组织获取项目列表
  * @param null 

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

@@ -56,7 +56,8 @@
 	import {
 		selectProject,
 		selectOrangaized,
-		refresh
+		refresh,
+		selectIdentity
 	} from '@/httpApi/loginRegister'
 	import {
 		getOrganizationDetailById
@@ -100,14 +101,21 @@
 				this.visible = true;
 			},
 			submit() {
+				this.$loading();
 				let indentity = this.project.projectListIdentity.find(node => node.id === this.indentityId);
 				if (this.indentityId == 6 || this.indentityId == 3) {
 					getOrganizationDetailById(this.project.organizationId).then(res => {
 						if (res.state) {
 							this.$store.dispatch('app/changeOrganization', res.data);
 							selectOrangaized(res.data).then(res => {
-								if (res.state) this.chageProject(indentity);
+								if (res.state) {
+									this.chageProject(indentity);
+								} else {
+									this.$loading.close();
+								}
 							})
+						} else {
+							this.$loading.close();
 						}
 					})
 				} else {
@@ -119,10 +127,12 @@
 					if (res.state) {
 						let user = res.data;
 						this.$store.dispatch('app/changeIdentity', indentity);
+						selectIdentity(indentity.id);
 						this.$store.dispatch('projectBase/changeProject', this.project);
 						localStorage.setItem('projectId', this.project.id);
 						this.$store.dispatch('app/changeUser', user);
-						if (this.indentityId === 3 || user.userId === 1) {
+						if (this.indentityId === 3 || user.userId === 1) {
+							this.$loading.close();
 							this.$store.dispatch('app/changeMenuData', user.resource ? JSON.parse(user.resource) :
 								[]);
 							setComment(user.menu ? user.menu : JSON.stringify([]));
@@ -137,7 +147,8 @@
 								identityId: this.indentityId,
 								type: this.project.type
 							}).then(node => {
-								if (node.state) {
+								if (node.state) {
+									this.$loading.close();
 									let role = node.data[0] || {};
 									this.$store.dispatch('app/changeMenuData', role
 										.resource ? JSON.parse(role.resource) : []);
@@ -150,11 +161,13 @@
 									})
 									this.$message.success('切换成功');
 								} else {
+									this.$loading.close();
 									this.$message.error('切换失败');
 								}
 							})
 						}
 					} else {
+						this.$loading.close();
 						this.$message.error('切换失败');
 					}
 				});

virgo.wzfrontend/console/src/loading/loading.js

@@ -18,7 +18,7 @@ export default {
 		    type: String
 		*/
 		Vue.prototype.$loading = function(obj = {}, type) {
-			if (!_LOADING.component) return;
+			if (!_LOADING.component && type == 'close') return;
 			if (type == 'close') {
 				_LOADING.component.show = _LOADING.show = false;
 			} else {

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

@@ -174,7 +174,7 @@
 									this.$store.dispatch('app/changeMenuData', user.resource ? JSON.parse(
 										user.resource) : []);
 									setComment(user.menu ? user.menu : JSON.stringify([]));
-									this.initProjectData(user.projectId);
+									this.initProjectData(user.projectId, user.identityId);
 								}
 							} else {
 								this.loginLoading = false;
@@ -185,7 +185,7 @@
 					}
 				})
 			},
-			initProjectData(projectId) {
+			initProjectData(projectId, identityId) {
 				getProjectListByIdentity().then(res => {
 					if (res.state) {
 						if (res.data.length === 0) {
@@ -201,7 +201,9 @@
 						let project = projectId === -1 ? res.data[0] : res.data.find(node => node.id ===
 							projectId);
 						this.$store.dispatch('projectBase/changeProject', project);
-						this.$store.dispatch('app/changeIdentity', project.projectListIdentity[0]);
+						let identity = identityId === -1 ? project.projectListIdentity[0] : project
+							.projectListIdentity.find(node => node.id === identityId);
+						this.$store.dispatch('app/changeIdentity', identity);
 						localStorage.setItem('projectId', projectId);
 						this.successLogin('/');
 					} else {

virgo.wzfrontend/console/src/views/work/datacenter/organization.vue

@@ -48,9 +48,9 @@
 							<span class="table-operation" v-if="!scope.row.directory" @click.stop="download(scope.row)">
 								下载
 							</span>
-							<span class="table-operation" v-if="scope.row.directory"
-								@click.stop="updateFolder(scope.row)">
-								重命名
+							<span class="table-operation" v-if="scope.row.directory"
+								@click.stop="updateFolder(scope.row)">
+								编辑
 							</span>
 							<span class="table-operation" @click.stop="deleteItem(scope.row)">
 								删除
@@ -212,10 +212,15 @@
 				this.formDialog = true;
 			},
 			deleteItem(data) {
-				this.$confirm(`确定要删除该文件${data.directory?'夹':''}?`, () => {
+				organizationPermission({
+					id: data.id,
+					permissions: data.permissions,
+					type: data.directory ? 'delete' : 'fileDelete',
+					name: data.name,
+					folderList: this.folderList
+				}, () => {
 					data.directory ? deleteOrganizationDir(data.id).then(this.successFunc) :
-						deleteOrganizationFile(data.id)
-						.then(this.successFunc);
+						deleteOrganizationFile(data.id).then(this.successFunc);
 				});
 			},
 			successFunc(res) {

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

@@ -288,10 +288,8 @@
 					name: data.name,
 					folderList: this.folderList
 				}, () => {
-					this.$confirm(`确定要删除该文件${data.directory?'夹':''}?`, () => {
-						data.directory ? deleteProjectDir(data.id).then(this.successFunc) :
-							deleteProjectFile(data.id).then(this.successFunc);
-					});
+					data.directory ? deleteProjectDir(data.id).then(this.successFunc) : deleteProjectFile(data.id)
+						.then(this.successFunc);
 				});
 			},
 			successFunc(res) {