USER-20230908AJ\Administrator il y a 1 an
Parent
commit
c21997c39e

+ 31 - 28
common/chart/rose_chart.vue

@@ -87,39 +87,42 @@
 			};
 		},
 		onReady() {
-			this.getServerData();
+			// this.getServerData();
 		},
 		methods: {
 			getServerData() {
 				//模拟从服务器获取数据时的延时
-				setTimeout(() => {
-					//模拟服务器返回数据,如果数据格式和标准格式不同,需自行按下面的格式拼接
-					let res = {
-						series: [{
-							data: [{
-								"name": "一班",
-								"value": 50
-							}, {
-								"name": "二班",
-								"value": 30
-							}, {
-								"name": "三班",
-								"value": 20
-							}, {
-								"name": "四班",
-								"value": 18
-							}, {
-								"name": "五班",
-								"value": 8
-							}, {
-								"name": "五班",
-								"value": 8
-							}]
-						}]
-					};
-					this.chartData = JSON.parse(JSON.stringify(res));
-				}, 500);
+				// setTimeout(() => {
+				// 	//模拟服务器返回数据,如果数据格式和标准格式不同,需自行按下面的格式拼接
+				// 	let res = {
+				// 		series: [{
+				// 			data: [{
+				// 				"name": "一班",
+				// 				"value": 50
+				// 			}, {
+				// 				"name": "二班",
+				// 				"value": 30
+				// 			}, {
+				// 				"name": "三班",
+				// 				"value": 20
+				// 			}, {
+				// 				"name": "四班",
+				// 				"value": 18
+				// 			}, {
+				// 				"name": "五班",
+				// 				"value": 8
+				// 			}, {
+				// 				"name": "五班",
+				// 				"value": 8
+				// 			}]
+				// 		}]
+				// 	};
+				// 	this.chartData = JSON.parse(JSON.stringify(res));
+				// }, 500);
 			},
+      setNoData(){
+        //设置空数据模板
+      },
       setServerData(data){
         setTimeout(() => {
           //模拟服务器返回数据,如果数据格式和标准格式不同,需自行按下面的格式拼接

+ 6 - 1
components/en-utils/en-select/en-select.vue

@@ -16,7 +16,7 @@
 				</view>
 			</scroll-view>
 		</view>
-		<EnButton :is_fixed="true" text="确认" @onSubmit="setAffirm(true)"></EnButton>
+		<EnButton v-if="showBut" :is_fixed="true" text="确认" @onSubmit="setAffirm(true)"></EnButton>
 	</view>
 </template>
 
@@ -26,6 +26,10 @@
 	export default {
 		name: 'peak_chart',
 		props: {
+      showBut: {
+        type: Boolean,
+        default: true
+      },
 			title: {
 				type: String,
 				default: '选择'
@@ -71,6 +75,7 @@
 				this.current = this.localData[index][this.itemKey]
 				this.newValue = this.localData[index][this.itemKey]
 				this.$emit('input', this.newValue)
+				this.$emit('onChange', index)
 			}
 		}
 	}

+ 3 - 2
pages/statistics/module/head_filter.vue

@@ -26,11 +26,11 @@
 		<uni-popup background-color="#fff" ref="popup" type="bottom" border-radius="10px" @change="onChangePopup"
 			@touchmove.stop.prevent="moveHandle">
 			<view v-if="selectType===1">
-				<EnSelect title="请选择统计类型" v-model="dateTypeObj.censusUserType" :local-data="userStatusList" ref="system"
+				<EnSelect :show-but="false" title="请选择统计类型" v-model="dateTypeObj.censusUserType" :local-data="userStatusList" ref="systemSelect"
 					@onChange="setCensusUserType"></EnSelect>
 			</view>
 			<view v-else>
-				<EnSelect title="请选择统计周期" v-model="dateTypeObj.dateType" :local-data="dateData" ref="system"
+				<EnSelect :show-but="false" title="请选择统计周期" v-model="dateTypeObj.dateType" :local-data="dateData" ref="systemDate"
 					@onChange="setDateType"></EnSelect>
 			</view>
 		</uni-popup>
@@ -156,6 +156,7 @@
 				}
 			},
 			setCensusUserType(index) {
+        console.log(index)
 				if (this.userStatusList[index] !== undefined) {
 					this.dateTypeObj.censusUserType = this.userStatusList[index].id
 					this.newUserTypeName = this.userStatusList[index].name

+ 7 - 1
pages/statistics/module/stat_industry.vue

@@ -55,7 +55,13 @@
 			},
 			setData(data) {
         this.industryList=data
-				this.$refs.roseChart.setServerData(this.industryList.roseData)
+        if(this.industryList.roseData.length>0){
+          this.$refs.roseChart.setServerData(this.industryList.roseData)
+        }else {
+          this.$refs.roseChart.setNoData()
+        }
+
+
 			}
 		}
 	}