fix

virgo.wzfrontend/console/src/components/work/common/model.vue

@@ -1312,33 +1312,6 @@
 					}, data => {})
 				} else if (this.type === 'indoor3d') {
 					this.bimViewer.setCameraState(this.indoor3dState);
-					this.bimViewer.HideOthers();
-					this.bimViewer.hideComponentsByObjectData([{
-						"family": "TJ双扇平开门",
-						"levelName": "A_4F(14.500)"
-					}, {
-						"family": "单扇推拉门",
-						"levelName": "A_4F(14.500)"
-					}, {
-						"family": "TJ单扇平开门",
-						"levelName": "A_4F(14.500)"
-					}, {
-						"family": "TJ子母门",
-						"levelName": "A_4F(14.500)"
-					}])
-					this.bimViewer.overrideComponentsColorByObjectData([{
-						"family": "楼板",
-						"levelName": "A_4F(14.500)"
-					}, {
-						"family": "幕墙",
-						"levelName": "A_4F(14.500)"
-					}, {
-						"family": "基本墙",
-						"levelName": "A_4F(14.500)"
-					}, {
-						"family": "常规模型 39",
-						"levelName": "A_4F(14.500)"
-					}])
 				} else {
 					this.bimViewer.setCameraState({
 						"name": "persp",
@@ -1369,7 +1342,7 @@
 			},
 			successFunc(res) {
 				if (res.state) {
-					let viewToken = res.data || '92aa1af9aebd47daaa61a1ce5c14e608';
+					let viewToken = res.data;
 					this.bimViewer = new bimView({
 						dom: document.getElementById('previewBim' + this._uid),
 						viewToken: viewToken,
@@ -1404,7 +1377,7 @@
 								}, {
 									"family": "常规模型 39",
 									"levelName": "A_4F(14.500)"
-								}])
+								}], "#cecece")
 							}
 							this.setData(this.list);
 						},

virgo.wzfrontend/console/src/views/work/energy/electrical/lift.vue

@@ -193,7 +193,9 @@
 							inNum: inNum,
 							outNum: outNum,
 						}
-					}
+					}
+					console.log(this.liftList);
+					console.log(this.$refs.model.setData);
 					if (this.$refs.model) this.$refs.model.setData(this.liftList);
 				})
 			},

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

@@ -44,16 +44,81 @@
 			<view class="project-title">
 				<view class="title-line"></view>
 				<view class="title-label">费用管理</view>
+				<view class="title-tab">
+					<uv-subsection :list="list" :current="current" activeColor="#08979c"
+						custom-style="border-radius: 16rpx;" custom-item-style="border-radius: 12rpx;" @change="change">
+					</uv-subsection>
+				</view>
 			</view>
 			<view class="project-content">
-				<view class="bill-subsection">
-					<uv-subsection :list="list" :current="current" custom-style="height: 60rpx;border-radius: 30rpx;"
-						custom-item-style="border-radius: 30rpx;" @change="change">
-					</uv-subsection>
+				<view class="bill-title">房租</view>
+				<view class="bill-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>
+				<view class="bill-title">物业</view>
+				<view class="bill-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>
-				<view class="bill-charts">
+				<view class="bill-title">水电</view>
+				<view class="bill-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>
+			</view>
+		</view>
+		<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="remind-chart">
 					<qiun-data-charts type="pie" :opts="opts" :chartData="chartData" :canvas2d="true"
-						canvasId="charts1">
+						canvasId="bmaEHARrUHkgUsKxeQaXEEonSPXpGtUP">
 					</qiun-data-charts>
 				</view>
 			</view>
@@ -65,6 +130,8 @@
 	export default {
 		data() {
 			return {
+				list: ['当月', '当年', '累计'],
+				current: 0,
 				chartData: {},
 				//您可以通过修改 config-ucharts.js 文件中下标为 ['pie'] 的节点来配置全局默认参数，如都是默认参数，此处可以不传 opts 。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式，达到页面简洁的需求。
 				opts: {
@@ -81,12 +148,11 @@
 							labelWidth: 15,
 							border: true,
 							borderWidth: 3,
-							borderColor: "#FFFFFF"
+							borderColor: "#FFFFFF",
+							linearType: "custom"
 						}
 					}
-				},
-				list: ['房租', '物业', '水电'],
-				current: 0
+				}
 			}
 		},
 		onReady() {
@@ -100,16 +166,20 @@
 					let res = {
 						series: [{
 							data: [{
-								"name": "应收",
-								"value": 50,
+								"name": "重要",
+								"value": 3,
+								"labelShow": false
+							}, {
+								"name": "会议",
+								"value": 1,
 								"labelShow": false
 							}, {
-								"name": "已收",
-								"value": 30,
+								"name": "看房",
+								"value": 1,
 								"labelShow": false
 							}, {
-								"name": "逾期",
-								"value": 20,
+								"name": "日常",
+								"value": 1,
 								"labelShow": false
 							}]
 						}]
@@ -128,11 +198,18 @@
 	.project-container {
 		padding: 30rpx;
 
-		.bill-subsection {
-			margin-top: 30rpx;
+		.bill-title {
+			padding: 10rpx;
+			font-weight: bold;
 		}
 
-		.bill-charts {
+		.bill-content {
+			background: $uni-background-color;
+			padding: 6rpx 0 10rpx 0;
+			border-radius: 16rpx;
+		}
+
+		.remind-chart {
 			height: 400rpx;
 		}
 
@@ -158,6 +235,12 @@
 				font-size: 32rpx;
 				font-weight: bold;
 				margin-left: 20rpx;
+				flex: 1;
+				width: 0;
+			}
+
+			.title-tab {
+				width: 320rpx;
 			}
 
 			.air-item {

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/avatar.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/projectAdmin/projectAdmin.wxss

@@ -9,10 +9,16 @@
 .project-container {
   padding: 30rpx;
 }
-.project-container .bill-subsection {
-  margin-top: 30rpx;
+.project-container .bill-title {
+  padding: 10rpx;
+  font-weight: bold;
+}
+.project-container .bill-content {
+  background: #f2f2f2;
+  padding: 6rpx 0 10rpx 0;
+  border-radius: 16rpx;
 }
-.project-container .bill-charts {
+.project-container .remind-chart {
   height: 400rpx;
 }
 .project-container .project-item {
@@ -35,6 +41,11 @@
   font-size: 32rpx;
   font-weight: bold;
   margin-left: 20rpx;
+  flex: 1;
+  width: 0;
+}
+.project-container .project-item .title-tab {
+  width: 320rpx;
 }
 .project-container .project-item .air-item {
   display: flex;

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
 }