Merge remote-tracking branch 'origin/dev' into preview

* origin/dev:
  服务清单mock

src/views/dataBoard/sida/cpts/fwqd.vue

@@ -87,10 +87,13 @@ export default {
 		// 获取房屋总数等
 		async getInfo() {
 			let url = '';
+			let mockId=0;
 			if (this.currentTab == '公共服务') {
 				url = 'common_service_view';
+				mockId=66900331;
 			} else {
 				url = 'self_service_views';
+				mockId=66902813
 			}
 
 			this.$refs.pieChart.showLoading();
@@ -104,7 +107,7 @@ export default {
 					}
 				},
 				{
-					// mockId: 60041615,
+					mockId: mockId,
 				}
 			);
 			this.$refs.pieChart.hideLoading();