fix

virgo.wzfrontend/console/src/components/work/business/organization/customData.vue

@@ -2,18 +2,22 @@
 	<div class="custom-data">
 		<table border="1" cellspacing="0" cellpadding="0">
 			<tr class="th-title">
-				<th style="width: 300px;">事件日期</th>
-				<th>事件内容</th>
+				<th style="width: 300px;">{{keyLabel}}</th>
+				<th>{{valueLabel}}</th>
 			</tr>
 			<tr v-for="(item,index) in listData" :key="index">
-				<td>
-					<el-date-picker v-model="item.keyName" value-format="yyyy-MM-dd" type="date"
-						placeholder="请选择日期">
+				<td>
+					<el-date-picker v-if="keyType === 'date'" v-model="item.keyName" value-format="yyyy-MM-dd"
+						type="date" placeholder="请选择日期">
+					</el-date-picker>
+					<el-date-picker v-else-if="keyType === 'yearDate'" v-model="item.keyName" type="year"
+						value-format="yyyy" placeholder="选择年">
 					</el-date-picker>
+					<el-input :type="keyType" v-model="item.keyName" v-else></el-input>
 				</td>
 				<td>
 					<div class="td-input">
-						<el-input v-model="item.value"></el-input>
+						<el-input :type="valueType" v-model="item.value"></el-input>
 						<div class="td-icon" @click="deleteRow(index)">
 							<i class="iconfont huifont-guanbi"></i>
 						</div>
@@ -41,6 +45,22 @@
 					return []
 				}
 			},
+			keyLabel: {
+				type: String,
+				default: ''
+			},
+			keyType: {
+				type: String,
+				default: 'text'
+			},
+			valueLabel: {
+				type: String,
+				default: ''
+			},
+			valueType: {
+				type: String,
+				default: 'text'
+			}
 		},
 		data() {
 			return {

virgo.wzfrontend/console/src/components/work/business/organization/detail.vue

@@ -76,21 +76,51 @@
 				</div>
 			</div>
 		</div>
-		<div v-if="detail.data && detail.data != '[]'">
-			<div class="hui-detail-title">历史背景</div>
+		<div v-if="detail.intellectualPropertyRight && detail.intellectualPropertyRight != '[]'">
+			<div class="hui-detail-title">知识产权</div>
 			<div class="hui-detail-content">
-				<div v-for="(item,index) in JSON.parse(detail.data)">
+				<div v-for="(item,index) in JSON.parse(detail.intellectualPropertyRight)">
 					<div class="hui-detail-item">
-						<div class="hui-detail-label">事件日期</div>
+						<div class="hui-detail-label">产权名称</div>
 						<div class="hui-detail-value">{{item.keyName}}</div>
 					</div>
 					<div class="hui-detail-item">
-						<div class="hui-detail-label">事件内容</div>
+						<div class="hui-detail-label">产权数量</div>
 						<div class="hui-detail-value">{{item.value}}</div>
 					</div>
 				</div>
 			</div>
 		</div>
+		<div v-if="detail.enterpriseMilestones && detail.enterpriseMilestones != '[]'">
+			<div class="hui-detail-title">企业里程碑</div>
+			<div class="hui-detail-content">
+				<div v-for="(item,index) in JSON.parse(detail.enterpriseMilestones)">
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">日期</div>
+						<div class="hui-detail-value">{{item.keyName}}</div>
+					</div>
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">内容</div>
+						<div class="hui-detail-value">{{item.value}}</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div v-if="detail.produce && detail.produce != '[]'">
+			<div class="hui-detail-title">历年产值</div>
+			<div class="hui-detail-content">
+				<div v-for="(item,index) in JSON.parse(detail.produce)">
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">年份</div>
+						<div class="hui-detail-value">{{item.keyName}}</div>
+					</div>
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">产值</div>
+						<div class="hui-detail-value">{{item.value}}万元</div>
+					</div>
+				</div>
+			</div>
+		</div>
 	</div>
 </template>
 

virgo.wzfrontend/console/src/components/work/business/organization/edit.vue

@@ -34,8 +34,11 @@
 				<el-form-item label="注册资本">
 					<el-input type="text" v-model="organizationForm.registeredCapital" placeholder="请输入注册资本"></el-input>
 				</el-form-item>
-				<el-form-item label="企业地址">
-					<el-input type="text" v-model="organizationForm.address" placeholder="请输入企业地址"></el-input>
+				<el-form-item label="信用代码">
+					<el-input type="text" v-model="organizationForm.creditCode" placeholder="请输入信用代码"></el-input>
+				</el-form-item>
+				<el-form-item label="企业编码">
+					<el-input type="text" v-model="organizationForm.enterpriseCode" placeholder="请输入企业编码"></el-input>
 				</el-form-item>
 				<el-form-item label="经营范围">
 					<el-input type="text" v-model="organizationForm.businessScope" placeholder="请输入经营范围"></el-input>
@@ -50,6 +53,10 @@
 				<el-form-item label="企业文化">
 					<el-input type="text" v-model="organizationForm.corporateCulture" placeholder="请输入企业文化"></el-input>
 				</el-form-item>
+				<el-form-item label="联系人">
+					<el-input type="text" v-model="organizationForm.contacts" placeholder="请输入联系人">
+					</el-input>
+				</el-form-item>
 				<el-form-item label="联系方式">
 					<el-input type="text" v-model="organizationForm.contactInformation" placeholder="请输入联系方式">
 					</el-input>
@@ -60,8 +67,28 @@
 				<el-form-item label="电子邮箱">
 					<el-input type="text" v-model="organizationForm.email" placeholder="请输入电子邮箱"></el-input>
 				</el-form-item>
-				<el-form-item label="历史背景" class="hui-textarea">
-					<custom-data ref="customData" :list="customList"></custom-data>
+				<el-form-item label="企业地址">
+					<el-input type="text" v-model="organizationForm.address" placeholder="请输入企业地址"></el-input>
+				</el-form-item>
+				<el-form-item label="企业标签" class="hui-textarea">
+					<el-checkbox-group v-model="checkList">
+						<el-checkbox :label="item.name" v-for="(item,index) in tagList" :key="index" :value="item.id">
+						</el-checkbox>
+					</el-checkbox-group>
+				</el-form-item>
+				<el-form-item label="知识产权" class="hui-textarea">
+					<custom-data ref="ownershipData" :list="ownershipList" keyLabel="产权名称" valueLabel="产权数量"
+						valueType="number">
+					</custom-data>
+				</el-form-item>
+				<el-form-item label="企业里程碑" class="hui-textarea">
+					<custom-data ref="customData" :list="customList" keyLabel="日期" keyType="date" valueLabel="里程内容">
+					</custom-data>
+				</el-form-item>
+				<el-form-item label="历年产出" class="hui-textarea">
+					<custom-data ref="produceData" :list="produceList" keyLabel="日期" keyType="yearDate"
+						valueLabel="产出金额(万元)" valueType="number">
+					</custom-data>
 				</el-form-item>
 			</el-form>
 		</div>
@@ -103,7 +130,31 @@
 					fax: '',
 					email: ''
 				},
+				tagList: [{
+					id: 1,
+					name: '国家科技型中小企业',
+					icon: 'iconfont huifont-V',
+					size: '20'
+				}, {
+					id: 2,
+					name: '国家高新企业',
+					icon: 'iconfont huifont-guojiagaoxinqiye',
+					size: '18'
+				}, {
+					id: 3,
+					name: '专业特新企业',
+					icon: 'iconfont huifont-zhuanjingtexinqiye',
+					size: '20'
+				}, {
+					id: 4,
+					name: '院士工作站',
+					icon: 'iconfont huifont-yuanshigongzuozhan',
+					size: '16'
+				}],
+				checkList: [],
+				ownershipList: [],
 				customList: [],
+				produceList: [],
 				loading: false
 			}
 		},
@@ -112,7 +163,14 @@
 				getOrganizationDetailById(this.detailId).then(res => {
 					if (res.state) {
 						this.organizationForm = res.data;
-						if (this.organizationForm.data) this.customList = JSON.parse(this.organizationForm.data);
+						if (this.organizationForm.intellectualPropertyRight) this.ownershipList = JSON.parse(this
+							.organizationForm.intellectualPropertyRight);
+						if (this.organizationForm.enterpriseMilestones) this.customList = JSON.parse(this
+							.organizationForm.enterpriseMilestones);
+						if (this.organizationForm.produce) this.produceList = JSON.parse(this.organizationForm
+							.produce);
+						if (this.organizationForm.enterpriseLabel) this.checkList = JSON.parse(this
+							.organizationForm.enterpriseLabel);
 					}
 				})
 			} else {
@@ -127,7 +185,10 @@
 					if (valid) {
 						let postData = JSON.parse(JSON.stringify(this.organizationForm));
 						postData['roomIds'] = this.$refs.selectHouse.selectNodeId;
-						postData['data'] = JSON.stringify(this.$refs.customData.listData);
+						postData['intellectualPropertyRight'] = JSON.stringify(this.$refs.ownershipData.listData);
+						postData['enterpriseMilestones'] = JSON.stringify(this.$refs.customData.listData);
+						postData['produce'] = JSON.stringify(this.$refs.produceData.listData);
+						postData['enterpriseLabel'] = JSON.stringify(this.checkList);
 						if (this.isUpdate) {
 							updateOrganization(postData).then(this.successFunc);
 						} else {

virgo.wzfrontend/console/src/components/work/property/propertyFlowForm.vue

@@ -46,6 +46,7 @@
 				<el-select v-model="propertyForm.modelBindType" placeholder="请选择绑定类型" @change="getModel">
 					<el-option label="构件ID" :value="1"></el-option>
 					<el-option label="模型库" :value="2"></el-option>
+					<el-option label="3D标签" :value="3"></el-option>
 				</el-select>
 			</el-form-item>
 			<el-form-item label="构件ID" v-if="propertyForm.modelBindType === 1">
@@ -57,6 +58,31 @@
 					</el-option>
 				</el-select>
 			</el-form-item>
+			<el-form-item label="3D标签" v-if="propertyForm.modelBindType === 3">
+				<el-select v-model="propertyForm.modelBindContent" placeholder="请选择3D标签">
+					<el-option :value="item.id" v-for="(item,index) in signList" :key="index">
+						<div class="option-item">
+							<img :src="item.iconPath" :alt="item.iconPath" />
+							<span>{{item.name}}</span>
+						</div>
+					</el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="模型位置" v-if="propertyForm.modelBindType === 2 || propertyForm.modelBindType === 3">
+				<div class="chart-input">
+					<el-input v-model="position.x">
+						<span slot="prefix">X</span>
+					</el-input>
+					<div class="line"></div>
+					<el-input v-model="position.y">
+						<span slot="prefix">Y</span>
+					</el-input>
+					<div class="line"></div>
+					<el-input v-model="position.z">
+						<span slot="prefix">Z</span>
+					</el-input>
+				</div>
+			</el-form-item>
 			<el-form-item label="厂家">
 				<el-input type="text" v-model="propertyForm.manufacturer" placeholder="请输入厂家"></el-input>
 			</el-form-item>
@@ -133,12 +159,35 @@
 				},
 				goDownData: [],
 				modelList: [],
-				codeVisible: false
+				codeVisible: false,
+				signList: [{
+					id: 1,
+					name: '摄像头',
+					iconPath: 'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/370f04b711094bebbf7623371678b426'
+				}, {
+					id: 2,
+					name: '门禁',
+					iconPath: 'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/2585f3b800b34181b6b36044ab517447'
+				}, {
+					id: 3,
+					name: '停车',
+					iconPath: 'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/1326f380e5c542c085899bde868358a8'
+				}, {
+					id: 4,
+					name: '照明',
+					iconPath: 'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/a8ad1d0f82bf453c8c972fcad32bf50e'
+				}],
+				position: {
+					x: '',
+					y: '',
+					z: ''
+				}
 			}
 		},
 		created() {
 			if (JSON.stringify(this.flowForm) === "{}") return this.getPartList();
 			this.propertyForm = this.flowForm;
+			if (this.flowForm.modelBindPosition) this.position = JSON.parse(this.propertyForm.modelBindPosition);
 			this.getPartList();
 		},
 		methods: {
@@ -196,6 +245,7 @@
 				this.propertyForm['projectId'] = this.$store.getters.project.id;
 				this.propertyForm['projectItemId'] = obj.projectItem.id;
 				this.propertyForm['projectItemTargetId'] = obj.projectItemTarget.id;
+				this.propertyForm['modelBindPosition'] = JSON.stringify(this.position);
 				return {
 					formData: this.propertyForm,
 					commonForm: {
@@ -225,6 +275,44 @@
 </script>
 
 <style lang="scss">
+	.property-flow-form {
+		.chart-input {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+
+			.line {
+				width: 10px;
+			}
+
+			.el-input__prefix {
+				position: absolute;
+				height: 100%;
+				left: 10px;
+				top: 0;
+				text-align: center;
+				color: $--color-common;
+				transition: none;
+			}
+
+			.el-input {
+				flex: 1;
+
+				.el-input__inner {
+					padding-left: 30px;
+				}
+			}
+		}
+
+	}
+
+	.option-item {
+		img {
+			width: 20px;
+			margin-right: 5px;
+		}
+	}
+
 	.coding-text {
 		border-radius: 2px;
 		border: 1px solid #545F79;

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

@@ -147,7 +147,7 @@
 							children: list
 						}, {
 							id: -2,
-							name: '模型绑定'
+							name: '空间设置'
 						}];
 						if (item.length === 0) this.nullType = 1;
 						this.selectRoom(item[0].projectItemTargetList[0].projectItemTargetRoomList[0]);

virgo.wzfrontend/yui_wx/App.vue

@@ -9,6 +9,12 @@
 			const savedState = uni.getStorageSync('vuex_state');
 			if (savedState) {
 				this.$store.replaceState(Object.assign({}, this.$store.state, savedState));
+				if (this.$store.getters.project.id) {
+					uni.setTabBarItem({
+						index: 2,
+						text: '工作台'
+					})
+				}
 			}
 			if (this.$store.getters.user.userId) this.$chat.connect(this.$store.getters.user.userId);
 			uni.$YeIM.intoApp();
@@ -17,7 +23,7 @@
 		onHide() {
 			// 保存状态到本地存储
 			uni.setStorageSync('vuex_state', this.$store.state);
-			uni.$YeIM.leaveApp();
+			uni.$YeIM.leaveApp();
 			uni.removeStorageSync('chatToken');
 		}
 	}

virgo.wzfrontend/yui_wx/components/Winglau14-lotusCalendar/Winglau14-lotusCalendar.css

@@ -1,291 +0,0 @@
-.lotus-calendar {
-	background: #fff;
-	position: absolute;
-	bottom: 0;
-	transform: translateY(100%);
-	animation: calendarMove 0.4s ease-in-out forwards;
-}
-
-.lotus-calendar-title {
-	font-size: 28rpx;
-	text-align: center;
-	padding-top: 30rpx;
-	color: #222;
-}
-
-.lotus-calendar-out {
-	animation: calendarOut 0.4s ease-in-out forwards;
-}
-
-.lotus-calendar-wrap {
-	position: fixed;
-	left: 0;
-	top: 0;
-	width: 100%;
-	height: 100%;
-	z-index: 999;
-}
-
-.lotus-calendar-chose {
-	position: relative;
-	/*display: -webkit-box;
-  display: -webkit-flex;*/
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	text-align: center;
-	font-size: 28rpx;
-	color: #333;
-}
-
-.lotus-calendar-chose::before {
-	content: '';
-	width: 100%;
-	height: 1px;
-	background: #eee;
-	position: absolute;
-	bottom: 0;
-}
-
-.lotus-calendar-chose-item {
-	flex: 1;
-	padding: 20rpx 0;
-}
-
-.lotus-calendar-chose-act {
-	position: relative;
-	color: #2979ff;
-}
-
-.lotus-calendar-chose-act::before {
-	content: '';
-	position: absolute;
-	left: 50%;
-	bottom: 0;
-	transform: translateX(-50%);
-	width: 40rpx;
-	height: 4rpx;
-	background: #2979ff;
-}
-
-.lotus-calendar-cur-date {
-	padding: 20rpx 40rpx 20rpx 40rpx;
-}
-
-.lotus-calendar-cur-text {
-	color: #2979ff;
-}
-
-.lotus-calendar-center {
-	font-size: 32rpx;
-	/*display: -webkit-box;
-  display: -webkit-flex;*/
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	justify-content: space-between;
-	text-align: center;
-}
-
-.lotus-calendar-week {
-	/*display: -webkit-box;
-  display: -webkit-flex;*/
-	display: flex;
-}
-
-.lotus-calendar-week-text {
-	width: 107rpx;
-	text-align: center;
-	font-size: 30rpx;
-	height: 60rpx;
-	line-height: 60rpx;
-	color: #333;
-}
-
-.lotus-calendar-days {
-	overflow: hidden;
-	padding-bottom: 10rpx;
-}
-
-.lotus-calendar-days-text {
-	float: left;
-	margin-bottom: 10rpx;
-	font-size: 30rpx;
-	width: 107rpx;
-	text-align: center;
-	height: 70rpx;
-	line-height: 70rpx;
-}
-
-.lotus-calendar-days-range {
-	background: #e4f2fd;
-}
-
-.lotus-calendar-days-gray {
-	color: #999;
-	width: 60rpx;
-	height: 60rpx;
-	line-height: 60rpx;
-	white-space: nowrap;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-.lotus-calendar-days-act {
-	color: #fff;
-	/*display: -webkit-box;
-  display: -webkit-flex;*/
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	margin-left: auto;
-	margin-right: auto;
-	text-align: center;
-	width: 70rpx;
-	height: 70rpx;
-	line-height: 70rpx;
-	background: #2979ff;
-}
-
-.lotus-calendar-prev {
-	color: #999;
-	font-size: 36rpx;
-}
-
-.lotus-calendar-next {
-	color: #999;
-	font-size: 36rpx;
-}
-
-.lotus-calendar-month {
-	flex: 1;
-	/*display: -webkit-box;
-  display: -webkit-flex;*/
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	justify-content: space-between;
-	padding-right: 120rpx;
-}
-
-.lotus-calendar-year {
-	flex: 1;
-	/*display: -webkit-box;
-  display: -webkit-flex;*/
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	justify-content: space-between;
-}
-
-.lotus-calendar-year2 {
-	margin: 20rpx 100rpx 0;
-	font-size: 34rpx;
-}
-
-.lotus-calendar-mask {
-	position: fixed;
-	left: 0;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	z-index: -1;
-	background: rgba(0, 0, 0, 0.5);
-}
-
-.lotus-calendar-months {
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	width: 100%;
-	padding-top: 200rpx;
-	min-height: 864rpx;
-	background: #fff;
-	z-index: 15;
-	color: #999;
-	box-sizing: border-box;
-}
-
-.lotus-calendar-months-box {
-	/*display: -webkit-box;
-  display: -webkit-flex;*/
-	display: flex;
-	align-content: center;
-	flex-wrap: wrap;
-	font-size: 32rpx;
-	padding-top: 80rpx;
-}
-
-.lotus-calendar-months-text {
-	width: 25%;
-	text-align: center;
-	padding: 30rpx 0;
-}
-
-.lotus-calendar-months-text2 {
-	padding-bottom: 20rpx;
-}
-
-.lotus-calendar-months-cancel {
-	padding: 30rpx 30rpx 0 0;
-	font-size: 32rpx;
-	text-align: right;
-}
-
-.lotus-calendar-months-cancel-icon {
-	width: 50rpx;
-	height: 50rpx;
-	vertical-align: middle;
-}
-
-.lotus-calendar-months-cancel2 {
-	padding-top: 0;
-	padding-right: 0;
-}
-
-@keyframes calendarMove {
-	0% {
-		transform: translateY(100%);
-	}
-
-	100% {
-		transform: translateY(0%);
-	}
-}
-
-@keyframes calendarOut {
-	0% {
-		transform: translateY(0%);
-	}
-
-	100% {
-		transform: translateY(100%);
-	}
-}
-
-.lotus-calendar-result-time {
-	font-size: 28rpx;
-	text-align: center;
-	color: #2979FF;
-}
-
-.lotus-calendar-result-btn {
-	font-size: 28rpx;
-	text-align: center;
-	color: #fff;
-	line-height: 70rpx;
-	background: #2979FF;
-	border-radius: 30rpx;
-	margin: 20rpx 40rpx 30rpx;
-}
-
-.lotus-calendar-cur-bg-month {
-	font-size: 320rpx;
-	position: absolute;
-	left: 50%;
-	top: 50%;
-	transform: translate3d(-50%, -50%, 0);
-	z-index: -1;
-	color: #e4e7ed;
-	white-space: nowrap;
-}

virgo.wzfrontend/yui_wx/components/common/navbar.vue

@@ -19,17 +19,15 @@
 			}
 		},
 		methods: {
-			// 获取状态栏高度
 			geStatusBarHeight() {
 				return uni.getSystemInfoSync()['statusBarHeight']
 			},
-			// 获取导航栏高度
 			getNavBarHeight() {
 				// #ifdef MP-WEIXIN
 				let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
 				// 导航栏高度 = 胶囊高度 + 上间距 + 下间距 + 微调	（menuButtonInfo.top - uni.getSystemInfoSync()['statusBarHeight'] = 上间距）	        
 				let navbarHeight = menuButtonInfo.height + (menuButtonInfo.top - uni.getSystemInfoSync()[
-					'statusBarHeight']) * 2 + 2
+					'statusBarHeight']) * 2 + 4
 				// #endif
 				// #ifdef APP-PLUS || H5
 				let navbarHeight = 44

virgo.wzfrontend/yui_wx/components/pinapp-empty-page/pinapp-empty-page.vue

@@ -1,37 +0,0 @@
-<template>
-	<view class="empty-box">
-		<image class="empty-image" src="/static/images/pinapp-empty-box.png"></image>
-		<view class="txt">{{ title }}</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			title: {
-				type: String,
-				default: '暂无数据',
-			},
-		},
-	}
-</script>
-
-<style lang="scss">
-	.empty-box {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		padding-top: 200rpx;
-
-		.empty-image {
-			width: 414rpx;
-			height: 240rpx;
-		}
-
-		.txt {
-			font-size: 26rpx;
-			color: #999;
-		}
-	}
-</style>

virgo.wzfrontend/yui_wx/pages.json

@@ -8,7 +8,7 @@
 	}, {
 		"path": "pages/index/index",
 		"style": {
-			"navigationBarTitleText": "工作台"
+			"navigationBarTitleText": "首页"
 		}
 	}, {
 		"path": "pages/data/data",
@@ -275,13 +275,16 @@
 		"style": {
 			"navigationBarTitleText": "数据中心"
 		}
-	},
-	{
-		"path" : "pages/file/file",
-		"style" : 
-		{
-			"navigationBarTitleText" : ""
-		}
+	}, {
+		"path": "pages/file/file",
+		"style": {
+			"navigationBarTitleText": ""
+		}
+	}, {
+		"path": "pages/projectAdmin/projectAdmin",
+		"style": {
+			"navigationBarTitleText": "项目工作台"
+		}
 	}],
 	"tabBar": {
 		"color": "#8c8c8c",

virgo.wzfrontend/yui_wx/pages/billInvoice/billInvoice.vue

@@ -31,8 +31,9 @@
 				<upload ref="upload" accept="all" type="insert"></upload>
 			</uni-forms-item>
 		</uni-forms>
-		<lotusCalendar :calendarData="calendarData" @returnDate="calendarChange" @closeCalendar="closeCalendar">
-		</lotusCalendar>
+		<uv-datetime-picker ref="dateTimePicker" v-model="nowTime" mode="datetime" @confirm="confirmTime"
+			:minDate="nowTime">
+		</uv-datetime-picker>
 		<uv-picker ref="picker" :columns="columns" @confirm="confirm" keyName="name" :key="columns.length"></uv-picker>
 		<view class="hui-button-box">
 			<view class="hui-button" @click="submit">保存</view>
@@ -42,7 +43,6 @@
 
 <script>
 	import upload from '@/components/common/upload.vue'
-	import lotusCalendar from "@/components/Winglau14-lotusCalendar/Winglau14-lotusCalendar.vue";
 	import {
 		insertPaymentInvoice,
 		putPaymentStatus
@@ -66,10 +66,7 @@
 				type: '',
 				billId: '',
 				columns: [],
-				calendarData: {
-					isShow: false,
-					choseTime: ''
-				},
+				nowTime: Number(new Date()),
 				invoice: {}
 			}
 		},
@@ -101,14 +98,9 @@
 			openDate() {
 				this.calendarData.isShow = true;
 			},
-			calendarChange(res) {
-				if (res.time) {
-					this.formData.date = res.time;
-				}
-				this.calendarData.isShow = res.isShow;
-			},
-			closeCalendar(res) {
-				this.calendarData.isShow = res.isShow;
+			confirm(e) {
+				let date = this.$dayjs(e.value).format('YYYY-MM-DD HH:mm');
+				this.formData.date = date;
 			},
 			submit() {
 				if (!this.formData.name) return this.$toast('请输入发票名称');
@@ -137,8 +129,7 @@
 			}
 		},
 		components: {
-			upload,
-			lotusCalendar
+			upload
 		},
 	}
 </script>

virgo.wzfrontend/yui_wx/pages/highseas/highseas.vue

@@ -1,28 +1,75 @@
 <template>
 	<view class="high-seas-container">
-		<navbar>
-			<view class="nav">
-				<view class="nav-city" @click="$navigateTo('/pages/city/city?activeCity='+JSON.stringify(activeCity))">
-					<uni-icons class="city-icon" type="location-filled" size="16"></uni-icons>
-					<text class="city-name">{{activeCity.cityName}}</text>
+		<view class="highseas-container" v-if="!project.id">
+			<navbar>
+				<view class="nav">
+					<view class="nav-city"
+						@click="$navigateTo('/pages/city/city?activeCity='+JSON.stringify(activeCity))">
+						<uni-icons class="city-icon" type="location-filled" size="16"></uni-icons>
+						<text class="city-name">{{activeCity.cityName}}</text>
+					</view>
+					<view class="nav-search" @click="$navigateTo('/pages/search/search')"
+						:style="'height:' + boundingClientRect.height + 'px;border-radius:' + boundingClientRect.height + 'px;line-height:'+(boundingClientRect.height-2)+'px'">
+						搜索房源或项目
+					</view>
+					<view class="wx-operation"
+						:style="'width:' + boundingClientRect.width + 'px;height:'+ boundingClientRect.height+'px;'">
+					</view>
 				</view>
-				<view class="nav-search" @click="$navigateTo('/pages/search/search')"
-					:style="'height:' + boundingClientRect.height + 'px;border-radius:' + boundingClientRect.height + 'px;line-height:'+(boundingClientRect.height-2)+'px'">
-					搜索房源或项目
-				</view>
-				<view class="wx-operation"
-					:style="'width:' + boundingClientRect.width + 'px;height:'+ boundingClientRect.height+'px;'">
-				</view>
-			</view>
-		</navbar>
-		<mescroll-body :top="getNavBarHeight()" bottom="20" @init="mescrollInit" @down="downCallback" @up="upCallback"
-			:down="{
+			</navbar>
+			<mescroll-body :top="getNavBarHeight()" bottom="20" @init="mescrollInit" @down="downCallback"
+				@up="upCallback" :down="{
 				auto:false
 			}">
-			<view class="house-list">
-				<house-item v-for="(item,index) in list" :house="item" :key="item.id"></house-item>
+				<view class="house-list">
+					<house-item v-for="(item,index) in list" :house="item" :key="item.id"></house-item>
+				</view>
+			</mescroll-body>
+		</view>
+		<view class="project-container" v-else :style="'padding-top: ' + getNavBarHeight() + 'rpx;'">
+			<view class="project-box">
+				<view class="project-item">
+					<view class="project-title">
+						<view class="title-line"></view>
+						<view class="title-label">房源分析</view>
+					</view>
+					<view class="project-content">
+						<view class="air-item">
+							<view class="test-item">
+								<view class="name">总面积(㎡)</view>
+								<view class="number">120</view>
+							</view>
+							<view class="line"></view>
+							<view class="test-item">
+								<view class="name">已租面积(㎡)</view>
+								<view class="number">120</view>
+							</view>
+							<view class="line"></view>
+							<view class="test-item">
+								<view class="name">剩余面积(㎡)</view>
+								<view class="number">120</view>
+							</view>
+						</view>
+						<view class="air-item">
+							<view class="test-item">
+								<view class="name">总房源(个)</view>
+								<view class="number">64</view>
+							</view>
+							<view class="line"></view>
+							<view class="test-item">
+								<view class="name">已租房源(个)</view>
+								<view class="number">63</view>
+							</view>
+							<view class="line"></view>
+							<view class="test-item">
+								<view class="name">剩余房源(个)</view>
+								<view class="number">1</view>
+							</view>
+						</view>
+					</view>
+				</view>
 			</view>
-		</mescroll-body>
+		</view>
 	</view>
 </template>
 
@@ -34,6 +81,8 @@
 		getOpenHouseListByPage
 	} from '@/request/api/house.js'
 	import city from '@/components/city-select/citys.js';
+	const systemInfo = uni.getSystemInfoSync();
+	const fontSize = systemInfo.platform === 'ios' ? 26 : 28; // 根据不同平台设置
 	export default {
 		mixins: [MescrollMixin], // 使用mixin
 		data() {
@@ -44,34 +93,39 @@
 					cityName: '',
 					cityCode: ''
 				},
-				coordinates: ''
+				coordinates: '',
+				project: {},
+				fontSize: fontSize
 			}
 		},
 		onShow() {
+			this.project = this.$store.getters.project;
 			// #ifdef MP-WEIXIN
 			this.boundingClientRect = wx.getMenuButtonBoundingClientRect();
 			// #endif
 		},
 		onLoad() {
-			uni.$on('changeCity', data => {
-				this.activeCity = data;
-				this.$store.dispatch('app/changeActiveCity', this.activeCity);
-				uni.setStorageSync('vuex_state', this.$store.state);
-				this.mescroll.resetUpScroll();
-			})
-			uni.getLocation({
-				type: 'wgs84',
-				success: res => {
-					this.coordinates = res.longitude + ',' + res.latitude;
-					this.$store.dispatch('app/changeCoordinates', this.coordinates);
+			if (!this.$store.getters.project.id) {
+				uni.$on('changeCity', data => {
+					this.activeCity = data;
+					this.$store.dispatch('app/changeActiveCity', this.activeCity);
 					uni.setStorageSync('vuex_state', this.$store.state);
-					this.getLocation();
-				},
-				fail: () => {
-					this.coordinates = this.$store.getters.coordinates;
-					this.getLocation();
-				}
-			});
+					this.mescroll.resetUpScroll();
+				})
+				uni.getLocation({
+					type: 'wgs84',
+					success: res => {
+						this.coordinates = res.longitude + ',' + res.latitude;
+						this.$store.dispatch('app/changeCoordinates', this.coordinates);
+						uni.setStorageSync('vuex_state', this.$store.state);
+						this.getLocation();
+					},
+					fail: () => {
+						this.coordinates = this.$store.getters.coordinates;
+						this.getLocation();
+					}
+				});
+			}
 		},
 		methods: {
 			getLocation() {
@@ -121,7 +175,7 @@
 				let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
 				// 导航栏高度 = 胶囊高度 + 上间距 + 下间距 + 微调	（menuButtonInfo.top - uni.getSystemInfoSync()['statusBarHeight'] = 上间距）	        
 				let navbarHeight = menuButtonInfo.height + (menuButtonInfo.top - uni.getSystemInfoSync()[
-					'statusBarHeight']) * 2 + 2
+					'statusBarHeight']) * 2 + 4
 				// #endif
 				// #ifdef APP-PLUS || H5
 				let navbarHeight = 44
@@ -158,6 +212,67 @@
 </script>
 
 <style lang="scss">
+	.project-container {
+		.project-box {
+			background: #fff;
+		}
+
+		.project-item {
+			padding: 30rpx;
+
+			.project-title {
+				display: flex;
+				align-items: center;
+			}
+
+			.title-line {
+				width: 18rpx;
+				height: 64rpx;
+				background: $uni-primary;
+				border-radius: 18rpx;
+			}
+
+			.title-label {
+				font-size: 32rpx;
+				font-weight: bold;
+				margin-left: 20rpx;
+			}
+
+			.air-item {
+				display: flex;
+				align-items: center;
+				margin-top: 20rpx;
+
+				.test-item {
+					flex: 1;
+					width: 0;
+					overflow: hidden;
+					text-align: center;
+					position: relative;
+				}
+
+				.name {
+					font-size: 24rpx;
+					margin-bottom: 8rpx;
+					line-height: 36rpx;
+					color: $uni-secondary-color;
+				}
+
+				.number {
+					font-size: 18px;
+					color: $uni-primary;
+				}
+
+				.line {
+					height: 32rpx;
+					width: 2rpx;
+					background: $uni-border-1;
+				}
+			}
+
+		}
+	}
+
 	.high-seas-container {
 		.nav {
 			height: 100%;
@@ -165,6 +280,7 @@
 			width: 100%;
 			display: flex;
 			align-items: center;
+			justify-content: center;
 
 			.nav-city {
 				height: 50rpx;

virgo.wzfrontend/yui_wx/pages/projectAdmin/projectAdmin.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

virgo.wzfrontend/yui_wx/pages/reservation/reservation.vue

@@ -28,7 +28,6 @@
 </template>
 
 <script>
-	import lotusCalendar from "@/components/Winglau14-lotusCalendar/Winglau14-lotusCalendar.vue";
 	import {
 		insertReservation
 	} from '@/request/api/house.js'
@@ -81,10 +80,7 @@
 					}
 				})
 			}
-		},
-		components: {
-			lotusCalendar
-		},
+		}
 	}
 </script>
 

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

@@ -54,7 +54,8 @@
     "pages/bimShow/bimShow",
     "pages/myReservation/myReservation",
     "pages/dataCenter/dataCenter",
-    "pages/file/file"
+    "pages/file/file",
+    "pages/projectAdmin/projectAdmin"
   ],
   "subPackages": [],
   "window": {

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/Winglau14-lotusCalendar/Winglau14-lotusCalendar.wxss

@@ -1,283 +0,0 @@
-.lotus-calendar {
-	background: #fff;
-	position: absolute;
-	bottom: 0;
-	-webkit-transform: translateY(100%);
-	        transform: translateY(100%);
-	-webkit-animation: calendarMove 0.4s ease-in-out forwards;
-	        animation: calendarMove 0.4s ease-in-out forwards;
-}
-.lotus-calendar-title {
-	font-size: 28rpx;
-	text-align: center;
-	padding-top: 30rpx;
-	color: #222;
-}
-.lotus-calendar-out {
-	-webkit-animation: calendarOut 0.4s ease-in-out forwards;
-	        animation: calendarOut 0.4s ease-in-out forwards;
-}
-.lotus-calendar-wrap {
-	position: fixed;
-	left: 0;
-	top: 0;
-	width: 100%;
-	height: 100%;
-	z-index: 999;
-}
-.lotus-calendar-chose {
-	position: relative;
-	/*display: -webkit-box;
-  display: -webkit-flex;*/
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	text-align: center;
-	font-size: 28rpx;
-	color: #333;
-}
-.lotus-calendar-chose::before {
-	content: '';
-	width: 100%;
-	height: 1px;
-	background: #eee;
-	position: absolute;
-	bottom: 0;
-}
-.lotus-calendar-chose-item {
-	flex: 1;
-	padding: 20rpx 0;
-}
-.lotus-calendar-chose-act {
-	position: relative;
-	color: #2979ff;
-}
-.lotus-calendar-chose-act::before {
-	content: '';
-	position: absolute;
-	left: 50%;
-	bottom: 0;
-	-webkit-transform: translateX(-50%);
-	        transform: translateX(-50%);
-	width: 40rpx;
-	height: 4rpx;
-	background: #2979ff;
-}
-.lotus-calendar-cur-date {
-	padding: 20rpx 40rpx 20rpx 40rpx;
-}
-.lotus-calendar-cur-text {
-	color: #2979ff;
-}
-.lotus-calendar-center {
-	font-size: 32rpx;
-	/*display: -webkit-box;
-  display: -webkit-flex;*/
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	justify-content: space-between;
-	text-align: center;
-}
-.lotus-calendar-week {
-	/*display: -webkit-box;
-  display: -webkit-flex;*/
-	display: flex;
-}
-.lotus-calendar-week-text {
-	width: 107rpx;
-	text-align: center;
-	font-size: 30rpx;
-	height: 60rpx;
-	line-height: 60rpx;
-	color: #333;
-}
-.lotus-calendar-days {
-	overflow: hidden;
-	padding-bottom: 10rpx;
-}
-.lotus-calendar-days-text {
-	float: left;
-	margin-bottom: 10rpx;
-	font-size: 30rpx;
-	width: 107rpx;
-	text-align: center;
-	height: 70rpx;
-	line-height: 70rpx;
-}
-.lotus-calendar-days-range {
-	background: #e4f2fd;
-}
-.lotus-calendar-days-gray {
-	color: #999;
-	width: 60rpx;
-	height: 60rpx;
-	line-height: 60rpx;
-	white-space: nowrap;
-	margin-left: auto;
-	margin-right: auto;
-}
-.lotus-calendar-days-act {
-	color: #fff;
-	/*display: -webkit-box;
-  display: -webkit-flex;*/
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	margin-left: auto;
-	margin-right: auto;
-	text-align: center;
-	width: 70rpx;
-	height: 70rpx;
-	line-height: 70rpx;
-	background: #2979ff;
-}
-.lotus-calendar-prev {
-	color: #999;
-	font-size: 36rpx;
-}
-.lotus-calendar-next {
-	color: #999;
-	font-size: 36rpx;
-}
-.lotus-calendar-month {
-	flex: 1;
-	/*display: -webkit-box;
-  display: -webkit-flex;*/
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	justify-content: space-between;
-	padding-right: 120rpx;
-}
-.lotus-calendar-year {
-	flex: 1;
-	/*display: -webkit-box;
-  display: -webkit-flex;*/
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	justify-content: space-between;
-}
-.lotus-calendar-year2 {
-	margin: 20rpx 100rpx 0;
-	font-size: 34rpx;
-}
-.lotus-calendar-mask {
-	position: fixed;
-	left: 0;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	z-index: -1;
-	background: rgba(0, 0, 0, 0.5);
-}
-.lotus-calendar-months {
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	width: 100%;
-	padding-top: 200rpx;
-	min-height: 864rpx;
-	background: #fff;
-	z-index: 15;
-	color: #999;
-	box-sizing: border-box;
-}
-.lotus-calendar-months-box {
-	/*display: -webkit-box;
-  display: -webkit-flex;*/
-	display: flex;
-	align-content: center;
-	flex-wrap: wrap;
-	font-size: 32rpx;
-	padding-top: 80rpx;
-}
-.lotus-calendar-months-text {
-	width: 25%;
-	text-align: center;
-	padding: 30rpx 0;
-}
-.lotus-calendar-months-text2 {
-	padding-bottom: 20rpx;
-}
-.lotus-calendar-months-cancel {
-	padding: 30rpx 30rpx 0 0;
-	font-size: 32rpx;
-	text-align: right;
-}
-.lotus-calendar-months-cancel-icon {
-	width: 50rpx;
-	height: 50rpx;
-	vertical-align: middle;
-}
-.lotus-calendar-months-cancel2 {
-	padding-top: 0;
-	padding-right: 0;
-}
-@-webkit-keyframes calendarMove {
-0% {
-		-webkit-transform: translateY(100%);
-		        transform: translateY(100%);
-}
-100% {
-		-webkit-transform: translateY(0%);
-		        transform: translateY(0%);
-}
-}
-@keyframes calendarMove {
-0% {
-		-webkit-transform: translateY(100%);
-		        transform: translateY(100%);
-}
-100% {
-		-webkit-transform: translateY(0%);
-		        transform: translateY(0%);
-}
-}
-@-webkit-keyframes calendarOut {
-0% {
-		-webkit-transform: translateY(0%);
-		        transform: translateY(0%);
-}
-100% {
-		-webkit-transform: translateY(100%);
-		        transform: translateY(100%);
-}
-}
-@keyframes calendarOut {
-0% {
-		-webkit-transform: translateY(0%);
-		        transform: translateY(0%);
-}
-100% {
-		-webkit-transform: translateY(100%);
-		        transform: translateY(100%);
-}
-}
-.lotus-calendar-result-time {
-	font-size: 28rpx;
-	text-align: center;
-	color: #2979FF;
-}
-.lotus-calendar-result-btn {
-	font-size: 28rpx;
-	text-align: center;
-	color: #fff;
-	line-height: 70rpx;
-	background: #2979FF;
-	border-radius: 30rpx;
-	margin: 20rpx 40rpx 30rpx;
-}
-.lotus-calendar-cur-bg-month {
-	font-size: 320rpx;
-	position: absolute;
-	left: 50%;
-	top: 50%;
-	-webkit-transform: translate3d(-50%, -50%, 0);
-	        transform: translate3d(-50%, -50%, 0);
-	z-index: -1;
-	color: #e4e7ed;
-	white-space: nowrap;
-}
-

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/contract/clauseDetail.json

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

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/aircondition.json

@@ -1,9 +1,9 @@
 {
-  "component": true,
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
     "l-slider": "/uni_modules/lime-slider/components/l-slider/l-slider",
     "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
     "uv-switch": "/uni_modules/uv-switch/components/uv-switch/uv-switch"
-  }
+  },
+  "component": true
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/device/lighting.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/components/highseas/highseas.js

@@ -0,0 +1 @@
+Component({})

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

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "navbar": "/components/common/navbar"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/highseas/highseas.wxml

@@ -0,0 +1 @@
+<view class="high-seas-container"></view>

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/highseas/project.js

@@ -0,0 +1 @@
+Component({})

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/highseas/project.wxml

@@ -0,0 +1 @@
+<view class="_div"></view>