fix

virgo.wzfrontend/console/src/components/common/noticeBoard/device.vue

@@ -178,7 +178,12 @@
 		getDeviceHistory
 	} from '@/httpApi/property'
 	export default {
-		props: ['detailId'],
+		props: {
+			detailId: {
+				type: Number,
+				default: 13
+			},
+		},
 		data() {
 			return {
 				detail: {},

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

@@ -501,26 +501,26 @@
 				indoorState: {
 					"name": "persp",
 					"position": {
-						"x": 10566.259694957296,
-						"y": -2920.5585095707893,
-						"z": 2227.418599240323
+						"x": -21925.30363077294,
+						"y": 55752.34081327461,
+						"z": 126154.88927467985
 					},
 					"target": {
-						"x": 7355.281398915804,
-						"y": -21190.64334795937,
-						"z": 206.02268070395849
+						"x": 21178.75833980839,
+						"y": 55542.325973281564,
+						"z": 42309.623807444455
 					},
 					"up": {
-						"x": 0,
-						"y": -0.0000036732051125063344,
-						"z": 0.9999999999932538
+						"x": 0.8893455691937338,
+						"y": -0.00434116997702428,
+						"z": 0.45721506186772126
 					},
-					"near": 1.0400857793302378,
-					"far": 8442.583401822878,
-					"zoom": 1,
+					"near": 70713.2441509424,
+					"far": 146128.882656921,
+					"zoom": 0.6724755006281219,
 					"version": 1,
 					"fov": 45,
-					"aspect": 1.3531073446327684,
+					"aspect": 1.1543810848400555,
 					"coordinateSystem": "world"
 				},
 				outdoorState: {
@@ -1100,14 +1100,6 @@
 					}
 				} else if (this.type === 'indoor') {
 					this.bimViewer.setCameraState(this.indoorState);
-					this.bimViewer.hideComponentsById(['2818831']);
-					this.bimViewer.setLight();
-					this.bimViewer.clearLight();
-					let ids = [];
-					for (let i = 0; i < list.length; i++) {
-						ids = ids.concat(list[i].column2)
-					}
-					if (ids.length > 0) this.indoor(ids);
 				} else if (this.type === 'outdoor') {
 					this.bimViewer.setCameraState(this.outdoorState);
 					this.bimViewer.overrideAllComponentsColor();

virgo.wzfrontend/console/src/views/work/energy/electrical/lighting/indoor.vue

@@ -6,7 +6,7 @@
 				<div class="indoor-box">
 					<div class="indoor-center">
 						<div class="bim-box" style="margin-top: 0;">
-							<model ref="model" type="indoor" fileId="10000746828136"></model>
+							<model ref="model" type="indoor" fileId="10000892771892"></model>
 						</div>
 					</div>
 					<div class="indoor-right color-font">

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

@@ -118,7 +118,140 @@
 			<view class="project-content">
 				<view class="remind-chart">
 					<qiun-data-charts type="pie" :opts="opts" :chartData="chartData" :canvas2d="true"
-						canvasId="bmaEHARrUHkgUsKxeQaXEEonSPXpGtUP">
+						canvasId="remind1">
+					</qiun-data-charts>
+				</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="order-title">内部工单</view>
+				<view class="order-item">
+					<view class="order-content">
+						<view class="order-item-li">
+							<view class="order-number">0</view>
+							<view class="order-label">工单数</view>
+						</view>
+						<view class="order-item-li">
+							<view class="order-number">0</view>
+							<view class="order-label">已完成</view>
+						</view>
+						<view class="order-item-li">
+							<view class="order-number">0</view>
+							<view class="order-label">未完成</view>
+						</view>
+					</view>
+					<view class="order-chart">
+						<qiun-data-charts type="arcbar" :opts="orderOpts" :chartData="orderChartData" :canvas2d="true"
+							canvasId="order1">
+						</qiun-data-charts>
+					</view>
+				</view>
+				<view class="order-title">外部工单</view>
+				<view class="order-item">
+					<view class="order-content">
+						<view class="order-item-li">
+							<view class="order-number">0</view>
+							<view class="order-label">工单数</view>
+						</view>
+						<view class="order-item-li">
+							<view class="order-number">0</view>
+							<view class="order-label">已完成</view>
+						</view>
+						<view class="order-item-li">
+							<view class="order-number">0</view>
+							<view class="order-label">未完成</view>
+						</view>
+					</view>
+					<view class="order-chart">
+						<qiun-data-charts type="arcbar" :opts="orderOpts" :chartData="orderChartData" :canvas2d="true"
+							canvasId="order2">
+						</qiun-data-charts>
+					</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="device-content">
+					<view class="order-item-li">
+						<view class="order-number">0</view>
+						<view class="order-label">总设备</view>
+					</view>
+					<view class="line"></view>
+					<view class="order-item-li">
+						<view class="order-number">0</view>
+						<view class="order-label">在线</view>
+					</view>
+					<view class="line"></view>
+					<view class="order-item-li">
+						<view class="order-number">0</view>
+						<view class="order-label">离线</view>
+					</view>
+					<view class="line"></view>
+					<view class="order-item-li">
+						<view class="order-number">0</view>
+						<view class="order-label">故障</view>
+					</view>
+				</view>
+				<view class="device-content">
+					<view class="order-item-li">
+						<view class="order-number">0</view>
+						<view class="order-label">总设备</view>
+					</view>
+					<view class="line"></view>
+					<view class="order-item-li">
+						<view class="order-number">0</view>
+						<view class="order-label">在线</view>
+					</view>
+					<view class="line"></view>
+					<view class="order-item-li">
+						<view class="order-number">0</view>
+						<view class="order-label">离线</view>
+					</view>
+					<view class="line"></view>
+					<view class="order-item-li">
+						<view class="order-number">0</view>
+						<view class="order-label">故障</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="bill-content" style="margin: 30rpx 0;">
+					<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="remind-chart">
+					<qiun-data-charts type="line" :opts="clinetOpts" :chartData="clientChartData" :ontouch="true"
+						:canvas2d="true" canvasId="clent1">
 					</qiun-data-charts>
 				</view>
 			</view>
@@ -152,6 +285,72 @@
 							linearType: "custom"
 						}
 					}
+				},
+				orderChartData: {
+					series: [{
+						name: "",
+						color: "#2fc25b",
+						data: 0.8
+					}]
+				},
+				orderOpts: {
+					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
+						"#ea7ccc"
+					],
+					padding: undefined,
+					title: {
+						name: "80%",
+						fontSize: 15,
+						color: "#2fc25b"
+					},
+					subtitle: {
+						name: "",
+						fontSize: 25,
+						color: "#666666"
+					},
+					extra: {
+						arcbar: {
+							type: "default",
+							width: 12,
+							backgroundColor: "#E9E9E9",
+							startAngle: 0.75,
+							endAngle: 0.25,
+							gap: 2,
+							linearType: "custom"
+						}
+					}
+				},
+				clientChartData: {
+					categories: ["24/01", "24/02", "24/03", "24/04", "24/05", "24/06"],
+					series: [{
+						name: "新增客户",
+						data: [35, 8, 25, 37, 4, 20]
+					}]
+				},
+				//您可以通过修改 config-ucharts.js 文件中下标为 ['line'] 的节点来配置全局默认参数，如都是默认参数，此处可以不传 opts 。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式，达到页面简洁的需求。
+				clientOpts: {
+					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
+						"#ea7ccc"
+					],
+					padding: [15, 15, 0, 5],
+					enableScroll: true,
+					legend: {},
+					xAxis: {
+						disableGrid: true,
+						scrollShow: true,
+						itemCount: 4
+					},
+					yAxis: {
+						gridType: "dash",
+						dashLength: 2
+					},
+					extra: {
+						line: {
+							type: "straight",
+							width: 2,
+							activeType: "hollow"
+						}
+					}
 				}
 			}
 		},
@@ -198,14 +397,85 @@
 	.project-container {
 		padding: 30rpx;
 
-		.bill-title {
+		.device-content {
+			text-align: center;
+			padding-right: 30rpx;
+			display: flex;
+			margin-top: 30rpx;
+			align-items: center;
+
+			.line {
+				height: 32rpx;
+				width: 2rpx;
+				background: $uni-border-1;
+			}
+
+			.order-item-li {
+				flex: 1;
+				text-align: center;
+			}
+
+			.order-number {
+				font-size: 40rpx;
+				color: $uni-primary;
+			}
+
+			.order-label {
+				font-size: 24rpx;
+				color: $uni-secondary-color;
+			}
+
+			.order-title {
+				text-align: left;
+			}
+		}
+
+		.order-item {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+
+		.order-content {
+			flex: 1;
+			width: 0;
+			padding-right: 30rpx;
+			display: flex;
+
+			.order-item-li {
+				flex: 1;
+				text-align: center;
+			}
+
+			.order-number {
+				font-size: 40rpx;
+				color: $uni-primary;
+			}
+
+			.order-label {
+				font-size: 24rpx;
+				color: $uni-secondary-color;
+			}
+
+			.order-title {
+				text-align: left;
+			}
+		}
+
+		.order-chart {
+			width: 200rpx;
+			height: 200rpx;
+		}
+
+		.bill-title,
+		.order-title {
 			padding: 10rpx;
 			font-weight: bold;
 		}
 
 		.bill-content {
 			background: $uni-background-color;
-			padding: 6rpx 0 10rpx 0;
+			padding: 6rpx 0 14rpx 0;
 			border-radius: 16rpx;
 		}
 

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

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

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,13 +9,71 @@
 .project-container {
   padding: 30rpx;
 }
-.project-container .bill-title {
+.project-container .device-content {
+  text-align: center;
+  padding-right: 30rpx;
+  display: flex;
+  margin-top: 30rpx;
+  align-items: center;
+}
+.project-container .device-content .line {
+  height: 32rpx;
+  width: 2rpx;
+  background: #d9d9d9;
+}
+.project-container .device-content .order-item-li {
+  flex: 1;
+  text-align: center;
+}
+.project-container .device-content .order-number {
+  font-size: 40rpx;
+  color: #08979c;
+}
+.project-container .device-content .order-label {
+  font-size: 24rpx;
+  color: #8c8c8c;
+}
+.project-container .device-content .order-title {
+  text-align: left;
+}
+.project-container .order-item {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.project-container .order-content {
+  flex: 1;
+  width: 0;
+  padding-right: 30rpx;
+  display: flex;
+}
+.project-container .order-content .order-item-li {
+  flex: 1;
+  text-align: center;
+}
+.project-container .order-content .order-number {
+  font-size: 40rpx;
+  color: #08979c;
+}
+.project-container .order-content .order-label {
+  font-size: 24rpx;
+  color: #8c8c8c;
+}
+.project-container .order-content .order-title {
+  text-align: left;
+}
+.project-container .order-chart {
+  width: 200rpx;
+  height: 200rpx;
+}
+.project-container .bill-title,
+.project-container .order-title {
   padding: 10rpx;
   font-weight: bold;
 }
 .project-container .bill-content {
   background: #f2f2f2;
-  padding: 6rpx 0 10rpx 0;
+  padding: 6rpx 0 14rpx 0;
   border-radius: 16rpx;
 }
 .project-container .remind-chart {

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

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