fix

virgo.wzfrontend/yui_wx/pages.json

@@ -265,13 +265,16 @@
 		"style": {
 			"navigationBarTitleText": ""
 		}
-	},
-	{
-		"path" : "pages/myReservation/myReservation",
-		"style" : 
-		{
-			"navigationBarTitleText" : "我的预约"
-		}
+	}, {
+		"path": "pages/myReservation/myReservation",
+		"style": {
+			"navigationBarTitleText": "我的预约"
+		}
+	}, {
+		"path": "pages/dataCenter/dataCenter",
+		"style": {
+			"navigationBarTitleText": "数据中心"
+		}
 	}],
 	"tabBar": {
 		"color": "#8c8c8c",
@@ -292,7 +295,7 @@
 			"selectedIconPath": "static/image/tabbar/highseas-active.png",
 			"text": "公海"
 		}, {
-			"pagePath": "pages/data/data",
+			"pagePath": "pages/dataCenter/dataCenter",
 			"iconPath": "static/image/tabbar/data.png",
 			"selectedIconPath": "static/image/tabbar/data-active.png",
 			"text": "数据"

virgo.wzfrontend/yui_wx/pages/dataCenter/dataCenter.vue

@@ -0,0 +1,114 @@
+<template>
+	<view>
+		<mescroll-empty :option="option" @emptyclick="$navigateTo('/pages/login/login')" v-if="isEmpty">
+		</mescroll-empty>
+		<view class="file-list" v-else>
+			<view class="file-item" v-for="(item,index) in tableData" :key="index">
+				<view class="file-image">
+					<image class="image" src="/static/image/datacenter/folder.png" mode="aspectFill"></image>
+				</view>
+				<view class="file-content">
+					<view class="title">{{item.name}}</view>
+					<view class="sub">2024-01-01</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		generateFileNodeProject,
+		getProjectDirList
+	} from '@/request/api/datacenter.js'
+	export default {
+		data() {
+			return {
+				option: {
+					tip: '暂未加入项目'
+				},
+				tableData: [],
+				parentId: '',
+				isEmpty: true
+			}
+		},
+		onShow() {
+			this.isEmpty = true;
+			if (!uni.getStorageSync('token')) {
+				this.option = {
+					tip: '暂未登录',
+					btnText: '点击登录'
+				}
+			} else if (!this.$store.getters.project.id) {
+				this.option = {
+					tip: '暂未加入项目'
+				}
+			} else {
+				this.isEmpty = false;
+			}
+		},
+		onLoad(body) {
+			console.log(body.parentId);
+			if (!body.parentId) return this.initProjectDir();
+			this.parentId = body.parentId;
+			this.projectDirList();
+		},
+		methods: {
+			initProjectDir() {
+				generateFileNodeProject(this.$store.getters.project.id).then(res => {
+					if (res.code === 200) {
+						this.tableData = res.data.sort((a, b) => b.directory - a.directory);
+						console.log(this.tableData);
+					}
+				});
+			},
+			projectDirList() {
+				getProjectDirList(this.parentId).then(res => {
+					if (res.code === 200) {
+						this.tableData = res.data.sort((a, b) => b.directory - a.directory);
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.file-list {
+		padding: 30rpx;
+
+		.file-item {
+			display: flex;
+			padding: 20rpx;
+			background: #fff;
+			display: flex;
+			align-items: center;
+			border-radius: 16rpx;
+			box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+			margin-bottom: 30rpx;
+
+			.file-image {
+				width: 100rpx;
+				height: 80rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-right: 30rpx;
+			}
+
+			.title {
+				font-size: 32rpx;
+				font-weight: 600;
+				margin-bottom: 10rpx;
+			}
+
+			.sub {
+				font-weight: 300;
+				font-size: 24rpx;
+				margin-top: 10rpx;
+				color: $uni-secondary-color;
+			}
+
+		}
+	}
+</style>

virgo.wzfrontend/yui_wx/pages/index/index.vue

@@ -199,12 +199,13 @@
 </template>
 
 <script>
+	import {
+		getProjectDetailById
+	} from '@/request/api/project.js'
 	export default {
 		data() {
 			return {
-				list: [
-					'https://images.unsplash.com/photo-1592229505726-ca121723b8ef?crop=entropy&cs=tinysrgb&fit=max&fm=jpg&ixid=M3wyMDUzMDJ8MHwxfHNlYXJjaHw0Mnx8aG90ZWx8ZW58MXx8fHwxNjg3NzA1MjkwfDA&ixlib=rb-4.0.3&q=80&w=1080'
-				],
+				list: [],
 				project: {},
 				option: {
 					tip: '暂未加入项目'
@@ -225,8 +226,22 @@
 				}
 			}
 			this.reloadMecroll = !this.reloadMecroll;
+			if (this.project.id && this.project.picture) {
+				this.list = JSON.parse(this.project.picture);
+				this.init();
+			}
 		},
-		methods: {}
+		methods: {
+			init() {
+				getProjectDetailById(this.project.id).then(res => {
+					if (res.code === 200) {
+						this.$store.dispatch('app/changeProject', res.data);
+						this.project = res.data;
+						this.list = JSON.parse(this.project.picture);
+					}
+				})
+			}
+		}
 	}
 </script>
 

virgo.wzfrontend/yui_wx/request/api/datacenter.js

@@ -0,0 +1,410 @@
+import {
+	request
+} from '@/request/request.js';
+/* 
+ * 上传base64文件
+ * 
+ */
+export function uploadBase64(data) {
+	return request({
+		url: `/file/filenode/base64`,
+		method: 'post',
+		data: data
+	});
+}
+/* 
+ * 获取目录列表
+ * 
+ */
+export function getDirList(parentId) {
+	return request({
+		url: `/file/dir/${parentId}`,
+		method: 'get'
+	});
+}
+/* 
+ * 新增目录
+ * @param {Object} data = {}
+ * 
+ */
+export function insertDir(data) {
+	return request({
+		url: `/file/dir/${data.parentId}`,
+		method: 'post',
+		data: data
+	});
+}
+/* 
+ * 编辑目录
+ * @param {Object} data = {}
+ * 
+ */
+export function updateDir(data) {
+	return request({
+		url: `/file/dir`,
+		method: 'put',
+		data: data
+	});
+}
+/* 
+ * 删除目录
+ * 
+ */
+export function deleteDir(id) {
+	return request({
+		url: `/file/dir/${id}`,
+		method: 'delete'
+	});
+}
+/* 
+ * 获取多个文档目录列表
+ * 
+ */
+export function getDirListByids(data) {
+	return request({
+		url: `/file/dir/folder`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 生成项目目录
+ * 
+ */
+export function generateFileNodeProject(projectId) {
+	return request({
+		url: `/file/fileNodeProject/${projectId}`,
+		method: 'get'
+	});
+}
+/* 
+ * 生成企业中心目录
+ * 
+ */
+export function generateFileNodeOrganization(projectId, organizationId, organizationTypeId) {
+	return request({
+		url: `/file/fileNodeOrganization/${projectId}/${organizationId}/${organizationTypeId}`,
+		method: 'get'
+	});
+}
+/* 
+ * 获取多个项目中心目录列表
+ * 
+ */
+export function getProjectDirListByids(data) {
+	return request({
+		url: `/file/fileNodeProject/folder`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 获取多个企业中心目录列表
+ * 
+ */
+export function getOrganizationDirListByids(data) {
+	return request({
+		url: `/file/fileNodeOrganization/folder`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 获取项目目录
+ * 
+ */
+export function getProjectDirList(parentId) {
+	return request({
+		url: `/file/listFileNodeProject/${parentId}`,
+		method: 'get'
+	});
+}
+/* 
+ * 获取企业中心目录
+ * 
+ */
+export function getOrganizationDirList(parentId) {
+	return request({
+		url: `/file/listFileNodeOrganization/${parentId}`,
+		method: 'get'
+	});
+}
+/*
+ * 获取文件夹或者文件权限
+ * @param {String} 
+ * 
+ */
+export function getProjectPermission(parentId, organizationId) {
+	return request({
+		url: `/file/permissions/${parentId}/${organizationId}`,
+		method: 'get'
+	});
+}
+/*
+ * 获取文件夹或者文件权限详情
+ * @param {String} 
+ * 
+ */
+export function getProjectPermissionDetail(parentId, organizationId) {
+	return request({
+		url: `/file/permissions/show/${parentId}/${organizationId}`,
+		method: 'get'
+	});
+}
+
+/*
+ * 获取成员在项目目录的权限
+ * 
+ * 
+ */
+export function getUserProjectPermissions(parentId, userId) {
+	return request({
+		url: `/file/userPermissions/project/${parentId}/${userId}`,
+		method: 'get'
+	});
+}
+/*
+ * 获取成员在企业中心目录的权限
+ * @param {Object} data = {}
+ * 
+ */
+export function getUserOrganizationPermissions(id, userId) {
+	return request({
+		url: `/file/userPermissions/organization/${id}/${userId}`,
+		method: 'get'
+	});
+}
+/*
+ * 获取成员在项目组织目录的权限
+ * @param {Object} data = {}
+ * 
+ */
+export function insertUserPermissions(data) {
+	return request({
+		url: `/file/userPermissions`,
+		method: 'post',
+		data: data
+	})
+}
+/*
+ * 修改成员在项目组织目录的权限
+ * @param {Object} data = {}
+ * 
+ */
+export function putUserPermissions(data) {
+	return request({
+		url: `/file/userPermissions`,
+		method: 'put',
+		data: data
+	})
+}
+/*
+ * 新增项目目录权限
+ * @param {Object} data = {}
+ * 
+ */
+export function insertProjectPermission(data) {
+	return request({
+		url: `/file/permissions`,
+		method: 'post',
+		data: data
+	})
+}
+/*
+ * 修改项目目录权限
+ * @param {Object} data = {}
+ * 
+ */
+export function updateProjectPermission(data) {
+	return request({
+		url: `/file/permissions`,
+		method: 'put',
+		data: data
+	})
+}
+/*
+ * 验证项目目录密码
+ * @param {Object} data = {}
+ * 
+ */
+export function validationProjectPermission(id, password) {
+	return request({
+		url: `/file/permissions/validation/${id}/${password}`,
+		method: 'get',
+	})
+}
+/*
+ * 验证项目组织目录密码
+ * @param {Object} data = {}
+ * 
+ */
+export function validationOrganizationPermission(id, password) {
+	return request({
+		url: `/file/fileNodeOrganization/${id}/${password}`,
+		method: 'get',
+	});
+}
+/*
+ * 下载文件
+ * @param {Object} data = {}
+ * 
+ */
+export function downloadFile(isFileNodeOrganization, id) {
+	return request({
+		method: 'get',
+		url: `/file/filenode/${isFileNodeOrganization}/${id}`,
+		responseType: 'arraybuffer'
+	})
+}
+/*
+ * 新增项目目录
+ * @param {Object} data = {}
+ * 
+ */
+export function insertProjectDir(data) {
+	return request({
+		url: `/file/fileNodeProject/dir/${data.parentId}`,
+		method: 'post',
+		data: data
+	})
+}
+/*
+ * 新增企业中心目录
+ * @param {Object} data = {}
+ * 
+ */
+export function insertOrganizationDir(data) {
+	return request({
+		url: `/file/fileNodeOrganization/dir/${data.parentId}`,
+		method: 'post',
+		data: data
+	})
+}
+/*
+ * 修改项目目录
+ * @param {Object} data = {}
+ * 
+ */
+export function updateProjectDir(data) {
+	return request({
+		url: `/file/fileNodeProject`,
+		method: 'put',
+		data: data
+	})
+}
+
+/*
+ * 修改企业中心目录
+ * @param {Object} data = {}
+ * 
+ */
+export function updateOrganizationDir(data) {
+	return request({
+		url: `/file/fileNodeOrganization`,
+		method: 'put',
+		data: data
+	})
+}
+/*
+ * 删除项目目录
+ * @param {Object} data = {}
+ * 
+ */
+export function deleteProjectDir(id) {
+	return request({
+		url: `/file/fileNodeProject/dir/${id}`,
+		method: 'delete'
+	})
+}
+/*
+ * 删除企业中心目录
+ * @param {Object} data = {}
+ * 
+ */
+export function deleteOrganizationDir(id) {
+	return request({
+		url: `/file/fileNodeOrganization/dir/${id}`,
+		method: 'delete'
+	})
+}
+/*
+ * 删除项目文件
+ * @param {Object} data = {}
+ * 
+ */
+export function deleteProjectFile(id) {
+	return request({
+		url: `/file/fileNodeProject/${id}`,
+		method: 'delete'
+	})
+}
+/*
+ * 删除企业中心文件
+ * @param {Object} data = {}
+ * 
+ */
+export function deleteOrganizationFile(id) {
+	return request({
+		url: `/file/fileNodeOrganization/${id}`,
+		method: 'delete'
+	})
+}
+/*
+ * 获取审核设置
+ * @param {Object} data = {}
+ * 
+ */
+export function getSetApprove(data) {
+	return request({
+		url: `/api/reviewerSet/set/query`,
+		method: 'post',
+		data: data
+	})
+}
+/*
+ * 新增审核设置
+ * @param {Object} data = {}
+ * 
+ */
+export function insertSetApprove(data) {
+	return request({
+		url: `/api/reviewerSet/set`,
+		method: 'post',
+		data: data
+	})
+}
+/*
+ * 编辑审核设置
+ * @param {Object} data = {}
+ * 
+ */
+export function updateSetApprove(data) {
+	return request({
+		url: `/api/reviewerSet/set`,
+		method: 'put',
+		data: data
+	})
+}
+/*
+ * 新增luckysheet数据
+ * @param {Object} data = {}
+ * 
+ */
+export function insertExcel(data) {
+	return request({
+		url: `/api/luckySheet`,
+		method: 'post',
+		data: data
+	})
+}
+/*
+ * 获取luckysheet数据
+ * @param {Object} data = {}
+ * 
+ */
+export function getExcelById(id) {
+	return request({
+		url: `/api/luckySheet/${id}`,
+		method: 'get'
+	})
+}

virgo.wzfrontend/yui_wx/request/request.js

@@ -1,4 +1,21 @@
 import config from "@/config";
+import store from "../store";
+const logout = () => {
+
+	uni.removeStorageSync('token');
+	uni.removeStorageSync('chatToken');
+	uni.removeStorageSync('vuex_state');
+	store.dispatch('app/changeOrganization', {});
+	store.dispatch('app/changeProject', {});
+	store.dispatch('app/changeUser', {});
+	store.dispatch('app/changeIdentity', {});
+	uni.removeTabBarBadge({
+		index: 1
+	})
+	uni.navigateTo({
+		url: '/pages/login/login'
+	})
+}
 export function request(options) {
 	return new Promise((resolve, reject) => {
 		let header = options.header || {
@@ -15,10 +32,21 @@ export function request(options) {
 				// 请求成功
 				if (res.statusCode === 200) {
 					resolve(res.data);
-					if (res.data.code != 200) uni.showToast({
-						title: res.data.message,
-						icon: 'none'
-					})
+					if (res.data.code != 200) {
+						if (res.data.code == 20005) {
+							if (!uni.getStorageSync('token')) return;
+							uni.showToast({
+								title: '登录过期，请重新登录',
+								icon: 'none'
+							})
+							logout();
+							return;
+						}
+						uni.showToast({
+							title: res.data.message,
+							icon: 'none'
+						})
+					}
 				} else {
 					// 可以根据项目要求修改错误处理
 					reject(res.data);

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/app.json

@@ -52,7 +52,8 @@
     "pages/deviceDetail/deviceDetail",
     "pages/bim/bim",
     "pages/bimShow/bimShow",
-    "pages/myReservation/myReservation"
+    "pages/myReservation/myReservation",
+    "pages/dataCenter/dataCenter"
   ],
   "subPackages": [],
   "window": {
@@ -84,7 +85,7 @@
         "text": "公海"
       },
       {
-        "pagePath": "pages/data/data",
+        "pagePath": "pages/dataCenter/dataCenter",
         "iconPath": "static/image/tabbar/data.png",
         "selectedIconPath": "static/image/tabbar/data-active.png",
         "text": "数据"

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/navbar.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/uni-mall-head/uni-mall-head.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
-  }
+  },
+  "component": true
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/dataCenter/dataCenter.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "数据中心",
+  "usingComponents": {
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/dataCenter/dataCenter.wxss

@@ -0,0 +1,41 @@
+@charset "UTF-8";
+/* 需要放到文件最上面 */
+/* 水平间距 */
+/* 水平间距 */
+/*
+ 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
+ */
+/* 水平间距 */
+.file-list {
+  padding: 30rpx;
+}
+.file-list .file-item {
+  display: flex;
+  padding: 20rpx;
+  background: #fff;
+  display: flex;
+  align-items: center;
+  border-radius: 16rpx;
+  box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+  margin-bottom: 30rpx;
+}
+.file-list .file-item .file-image {
+  width: 100rpx;
+  height: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 30rpx;
+}
+.file-list .file-item .title {
+  font-size: 32rpx;
+  font-weight: 600;
+  margin-bottom: 10rpx;
+}
+.file-list .file-item .sub {
+  font-weight: 300;
+  font-size: 24rpx;
+  margin-top: 10rpx;
+  color: #8c8c8c;
+}
+

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,7 +1,8 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -9,28 +10,20 @@
     "postcss": true,
     "minified": true,
     "newFeature": true,
-    "bigPackageSizeSupport": true
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
   },
   "compileType": "miniprogram",
-  "libVersion": "",
+  "libVersion": "3.5.3",
   "appid": "wx3c006d364161d240",
   "projectname": "yui_wx",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
-    },
-    "conversation": {
-      "current": -1,
-      "list": []
-    },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
-    }
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/hb-comment/components/hb-comment/hb-comment.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-dateformat": "/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-toolbar/components/uv-toolbar/uv-toolbar.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }