fix

virgo.wzfrontend/console/public/index.html

@@ -28,7 +28,6 @@
 		<script type="text/javascript" src="https://api.tianditu.gov.cn/api?v=4.0&tk=72632adad893994a0450b55949c8a8fc">
 		</script>
 		<title>红链智慧建筑</title>
-		<script src="<%= BASE_URL %>jquery.js"></script>
 		<link rel="stylesheet" type="text/css" href="<%= BASE_URL %>icon/font.css" />
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/echarts/5.4.3/echarts.min.js"></script>
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/echarts-gl/2.0.8/echarts-gl.min.js"></script>

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="(type != 'organization') && $store.getters.project.id != 26">
+				<el-form-item label="访问权限" v-if="!isUpdate">
 					<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="type === 'organization'&& setData.permissions == 3">
+				<el-form-item label="访问密码" v-if="!isUpdate && setData.permissions == 3">
 					<el-input type="text" v-model="setData.password" placeholder="访问密码"></el-input>
 				</el-form-item>
 			</el-form>
@@ -47,7 +47,6 @@
 		},
 		created() {
 			if (this.isUpdate) {
-				console.log(this.detail);
 				this.setData = JSON.parse(JSON.stringify(this.detail));
 			} else {
 				this.setData['parentId'] = this.parentId;

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

@@ -28,20 +28,21 @@
 		insertProjectPermission
 	} from '@/httpApi/datacenter'
 	export default {
-		props: ['detailId'],
+		props: ['detail'],
 		data() {
 			return {
 				setData: {
-					permissions: '1',
+					permissions: '',
 					password: ''
 				}
 			}
 		},
 		created() {
-			getProjectPermissionDetail(this.detailId, -1).then(res => {
+			this.setData['permissions'] = this.detail.permissions;
+			getProjectPermissionDetail(this.detail.id, -1).then(res => {
 				if (res.state) {
 					this.setData = res.data || {
-						permissions: '1',
+						permissions: this.detail.permissions,
 						password: ''
 					};
 				}

virgo.wzfrontend/console/src/components/message/message.vue

@@ -15,7 +15,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					<el-table-column label="时间" prop="date" width="180"></el-table-column>
+					<el-table-column label="时间" prop="sentTime" width="180"></el-table-column>
 					<el-table-column label="消息类型" prop="messageType" width="150">
 						<template slot-scope="scope">
 							<span>{{messageType(scope.row.messageType).name}}</span>
@@ -71,23 +71,25 @@
 				let data = {
 					projectId: this.$store.getters.project.id,
 					organizationId: this.$store.getters.organization.id,
-					receiver: this.$store.getters.user.userId
+					userId: this.$store.getters.user.userId
 				}
 				if (this.option) data = Object.assign(data, this.option);
 				getMessagePageListByQuery(this.pageIndex, this.pageSize, data).then(res => {
 					if (res.state) {
-						this.tableData = res.data.dataList;
+						this.tableData = res.data.dataList.map(node => {
+							return Object.assign(node, JSON.parse(node.json));
+						});
 						this.totalCount = res.data.totalCount;
 					}
 				})
 			},
 			detail(item) {
-				if (!item.viewed) this.msg.viewed(item.id, this.init);
+				if (!item.viewed) this.$msg.viewed(item.id, this.init);
 				this.item = item;
 				this.drawer = true;
 			},
 			messageType(type) {
-				return this.msg.messageType.filter(item => item.id === type)[0];
+				return this.$msg.messageType.filter(item => item.id === type)[0];
 			},
 			currentChange(pageIndex) {
 				this.pageIndex = pageIndex;

virgo.wzfrontend/console/src/components/message/modules/datacenterDetail.vue

@@ -56,7 +56,7 @@
 		},
 		created() {
 			let reg1 = /(?<=\【)(.+?)(?=\】)/g; // {} 花括号，大括号
-			this.detail['data'] = this.detail.message.match(reg1)
+			this.detail['data'] = this.detail.message.match(reg1);
 			let data = this.$msg.messageType.filter(node => node.id === this.detail.messageType)[0].dataType.filter(node =>
 				node.id === this.detail.dataType)[0];
 			this.detail['fileType'] = data.type;

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

@@ -1,5 +1,5 @@
 import request from '@/axios'
-
+import config from '@/config'
 /* 
  * 获取菜单列表
  * 
@@ -102,7 +102,8 @@ export function updateIdentityResource(data) {
  * 
  * 
  */
-export function downloadFile(fileId) {
+export function downloadFile(fileId) {
+	console.log(config.baseURL + '/file/filenode/' + fileId);
 	return window.location.href = config.baseURL + '/file/filenode/' + fileId;
 }
 /* 

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

@@ -10,7 +10,10 @@
 				<span class="tips" v-if="index !== levelList.length - 1">/</span>
 			</div>
 		</div>
-		<div>当前组织：{{$store.getters.organization.name}}</div>
+		<div style="display: flex;align-items: center;">
+			<span>{{$store.getters.organization.name}}</span>
+			<span class="hui-tag hui-tag-success" style="margin-left: 10px;">{{$store.getters.identity.name}}</span>
+		</div>
 	</div>
 </template>
 

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 (type == 'close') {
 				_LOADING.component.show = _LOADING.show = false;
 			} else {

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

@@ -74,8 +74,41 @@ const approveUser = (option, callback) => {
 	})
 }
 
+const operationName = (type) => {
+	let str = '';
+	switch (type) {
+		case 'access':
+			str = '访问';
+			break;
+		case 'create':
+			str = '创建';
+			break;
+		case 'delete':
+			str = '删除';
+			break;
+		case 'edit':
+			str = '编辑';
+			break;
+		case 'fileDelete':
+			str = '删除';
+			break;
+		case 'fileDownload':
+			str = '下载';
+			break;
+		case 'fileUpload':
+			str = '上传';
+			break;
+		case 'fileView':
+			str = '预览';
+			break;
+		default:
+			break;
+	}
+	return str;
+}
+
 const approveTip = (option) => {
-	let title = option.type === 'access' ? '该文件是私密文件夹，是否申请访问？' : '该文件是私密文件，是否申请下载？';
+	let title = `该文件是私密文件夹，是否申请${operationName(option.type)}？`;
 	MessageBox.confirm(title, '系统提示', {
 		confirmButtonText: '确定',
 		cancelButtonText: '取消',
@@ -89,7 +122,7 @@ const approveTip = (option) => {
 			folder += ('-' + option.folderList[i].name);
 		}
 		let folderName = `【${option.typeName}${folder}-${option.name}】`;
-		let title = option.type === 'access' ? `申请访问${folderName}` : `申请下载${folderName}`;
+		let title = `申请${operationName(option.type)}${folderName}`;
 		message.sendFlowMessage({}, {
 			operation: title,
 			receiver: checker.join(','),
@@ -108,13 +141,25 @@ const returnType = (option) => {
 		case 1:
 			obj = {
 				access: 1,
-				fileDownload: 2
+				create: 2,
+				delete: 3,
+				edit: 4,
+				fileDelete: 5,
+				fileDownload: 6,
+				fileUpload: 7,
+				fileView: 8
 			}
 			break;
 		case 2:
 			obj = {
-				access: 3,
-				fileDownload: 4
+				access: 9,
+				create: 10,
+				delete: 11,
+				edit: 12,
+				fileDelete: 13,
+				fileDownload: 14,
+				fileUpload: 15,
+				fileView: 16
 			}
 			break;
 		default:
@@ -124,7 +169,7 @@ const returnType = (option) => {
 }
 //密码验证
 const password = (option, callback) => {
-	let title = option.type === 'access' ? '该文件是加密文件夹，请输入密码访问' : '该文件是加密文件，请输入密码下载？';
+	let title = `该文件是加密文件夹，请输入密码${operationName(option.type)}？`;
 	MessageBox.prompt(title, '系统提示', {
 		confirmButtonText: '确定',
 		cancelButtonText: '取消',

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

@@ -47,23 +47,83 @@ const messageType = [{
 	dataType: [{
 		id: 1,
 		title: '项目中心',
-		content: '目录',
+		content: '文件夹',
 		type: 'access'
 	}, {
 		id: 2,
 		title: '项目中心',
+		content: '文件夹',
+		type: 'create'
+	}, {
+		id: 3,
+		title: '项目中心',
+		content: '文件夹',
+		type: 'delete'
+	}, {
+		id: 4,
+		title: '项目中心',
+		content: '文件夹',
+		type: 'edit'
+	}, {
+		id: 5,
+		title: '项目中心',
+		content: '文件',
+		type: 'fileDelete'
+	}, {
+		id: 6,
+		title: '项目中心',
 		content: '文件',
 		type: 'fileDownload'
 	}, {
-		id: 3,
+		id: 7,
+		title: '项目中心',
+		content: '文件',
+		type: 'fileUpload'
+	}, , {
+		id: 8,
+		title: '项目中心',
+		content: '文件',
+		type: 'fileView'
+	}, {
+		id: 9,
 		title: '企业中心',
-		content: '目录',
+		content: '文件夹',
 		type: 'access'
 	}, {
-		id: 4,
+		id: 10,
+		title: '企业中心',
+		content: '文件夹',
+		type: 'create'
+	}, {
+		id: 11,
+		title: '企业中心',
+		content: '文件夹',
+		type: 'delete'
+	}, {
+		id: 12,
+		title: '企业中心',
+		content: '文件夹',
+		type: 'edit'
+	}, {
+		id: 13,
+		title: '企业中心',
+		content: '文件',
+		type: 'fileDelete'
+	}, {
+		id: 14,
 		title: '企业中心',
 		content: '文件',
 		type: 'fileDownload'
+	}, {
+		id: 15,
+		title: '企业中心',
+		content: '文件',
+		type: 'fileUpload'
+	}, , {
+		id: 16,
+		title: '企业中心',
+		content: '文件',
+		type: 'fileView'
 	}]
 }, {
 	id: 6,
@@ -130,7 +190,8 @@ export default {
 	messageContent(params) {
 		let message = '';
 		if (params.messageType === 6) {
-			message = `【项目邀请】${store.getters.user.name}在${dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')}邀请加入<${store.getters.project.name}>项目，请及时处理。`
+			message =
+				`【项目邀请】${store.getters.user.name}在${dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')}邀请加入<${store.getters.project.name}>项目，请及时处理。`
 		}
 		return message;
 	},

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

@@ -42,16 +42,15 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="createDate" label="创建日期" width="300"></el-table-column>
-				<el-table-column prop="createDate" label="大小" width="300"></el-table-column>
 				<el-table-column label="操作" width="150">
 					<template slot-scope="scope">
 						<div class="hui-table-operation" @click.stop="()=>{}">
 							<span class="table-operation" v-if="!scope.row.directory" @click.stop="download(scope.row)">
 								下载
 							</span>
-							<span class="table-operation" @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)">
 								删除
@@ -73,7 +72,7 @@
 			<set-approve v-if="setDialog" @callback="callBack" :type="2"></set-approve>
 		</el-dialog>
 		<el-dialog title="审核列表" :visible.sync="messageVisible" width="80%" :append-to-body="true">
-			<message v-if="messageVisible" :option="{messageType:5,dataTypes:'3,4'}"></message>
+			<message v-if="messageVisible" :option="{messageType:5,dataTypes:'4,5,6'}"></message>
 		</el-dialog>
 	</div>
 </template>

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

@@ -41,24 +41,23 @@
 						</div>
 					</template>
 				</el-table-column>
-				<!-- <el-table-column prop="createDate" label="创建日期" width="300"></el-table-column> -->
 				<el-table-column label="操作" width="200">
 					<template slot-scope="scope">
 						<div class="hui-table-operation" @click.stop="()=>{}">
 							<span class="table-operation" @click.stop="setPermission(scope.row)">
-								设置
+								权限
 							</span>
 							<span class="table-operation" v-if="!scope.row.directory" @click.stop="download(scope.row)">
 								下载
 							</span>
 							<span class="table-operation"
 								v-if="!scope.row.directory && isPreview(iconName(scope.row.name)).isPreview"
-								@click.stop="previewFile(scope.row,isPreview(iconName(scope.row.name)).type)">
+								@click.stop="preview(scope.row,isPreview(iconName(scope.row.name)).type)">
 								预览
 							</span>
 							<span class="table-operation" v-if="scope.row.directory"
 								@click.stop="updateFolder(scope.row)">
-								编辑
+								重命名
 							</span>
 							<span class="table-operation" @click.stop="deleteItem(scope.row)">
 								删除
@@ -72,7 +71,7 @@
 			</el-table>
 		</div>
 		<el-dialog title="设置" :visible.sync="dialogVisible" :append-to-body="true">
-			<set-permission v-if="dialogVisible" @callback="callBack" :detailId="detailId"></set-permission>
+			<set-permission v-if="dialogVisible" @callback="callBack" :detail="detail"></set-permission>
 		</el-dialog>
 		<el-dialog :title="isUpdate?'编辑文件夹':'新建文件夹'" :visible.sync="formDialog" width="900px" :append-to-body="true">
 			<folder-form v-if="formDialog" @callback="callBack" :parentId="parentId" :detail="detail"
@@ -83,7 +82,7 @@
 			<set-approve v-if="setDialog" @callback="callBack" :type="1" title="设置审核人"></set-approve>
 		</el-dialog>
 		<el-dialog title="审核列表" :visible.sync="messageVisible" width="80%" :append-to-body="true">
-			<message v-if="messageVisible" :option="{messageType:5,dataTypes:'1,2'}"></message>
+			<message v-if="messageVisible" :option="{messageType:5,dataTypes:'1,2,3'}"></message>
 		</el-dialog>
 		<el-dialog title="预览" :visible.sync="fileVisible" width="900px" :append-to-body="true">
 			<video v-if="previewType === 'video' && iframeSrc && fileVisible" :src="iframeSrc" width="100%"
@@ -128,7 +127,6 @@
 				tableData: [],
 				parentId: -1,
 				dialogVisible: false,
-				detailId: '',
 				formDialog: false,
 				isUpdate: false,
 				detail: {},
@@ -228,6 +226,17 @@
 					});
 				});
 			},
+			preview(data, type) {
+				projectPermission({
+					id: data.id,
+					oldPermission: data.permissions || '1',
+					type: 'fileView',
+					name: data.name,
+					folderList: this.folderList
+				}, () => {
+					this.previewFile(data, type);
+				});
+			},
 			isPreview(filename) {
 				let type = '',
 					isPreview = false,
@@ -263,7 +272,7 @@
 				if (type === 'init') this.init();
 			},
 			setPermission(data) {
-				this.detailId = data.id;
+				this.detail = data;
 				this.dialogVisible = true;
 			},
 			updateFolder(data) {
@@ -272,9 +281,17 @@
 				this.formDialog = true;
 			},
 			deleteItem(data) {
-				this.$confirm(`确定要删除该文件${data.directory?'夹':''}?`, () => {
-					data.directory ? deleteProjectDir(data.id).then(this.successFunc) : deleteProjectFile(data.id)
-						.then(this.successFunc);
+				projectPermission({
+					id: data.id,
+					oldPermission: data.permissions || '1',
+					type: data.directory ? 'delete' : 'fileDelete',
+					name: data.name,
+					folderList: this.folderList
+				}, () => {
+					this.$confirm(`确定要删除该文件${data.directory?'夹':''}?`, () => {
+						data.directory ? deleteProjectDir(data.id).then(this.successFunc) :
+							deleteProjectFile(data.id).then(this.successFunc);
+					});
 				});
 			},
 			successFunc(res) {
@@ -300,7 +317,7 @@
 					this.fileVisible = true;
 				} else if (type === 'docx' || type === 'doc') {
 					this.iframeSrc =
-						`./pdf/web/viewer.html?file=https://www.workark.com/file/fileNodeProject/${data.id}/renderPdf`;
+						`./pdf/web/viewer.html?file=https://www.waywish.com/file/fileNodeProject/${data.id}/renderPdf`;
 					this.previewType = 'pdf';
 					this.fileVisible = true;
 				} else if (type === 'xlsx') {

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

@@ -42,8 +42,9 @@
 									@click.stop="download(scope.row)">
 									下载
 								</span>
-								<span class="table-operation" @click.stop="update(scope.row)">
-									编辑
+								<span class="table-operation" v-if="scope.row.directory"
+									@click.stop="update(scope.row)">
+									重命名
 								</span>
 								<span class="table-operation" @click.stop="deleteItem(scope.row)">
 									删除