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

src/views/modules/census/census-houseList.vue

@@ -66,7 +66,7 @@
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
 												<div class="num">{{ item.value }}</div>
-												<div class="unit" :style="{ color: color[index] }">{{ item.value / 100 }}%</div>
+												<div class="unit" :style="{ color: color[index] }">{{ item.radio}}%</div>
 											</div>
 										</div>
 									</div>
@@ -98,7 +98,7 @@
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
 												<div class="num">{{ item.value }}</div>
-												<div class="unit" :style="{ color: color[index] }">{{ item.value / 100 }}%</div>
+												<div class="unit" :style="{ color: color[index] }">{{ item.radio}}%</div>
 											</div>
 										</div>
 									</div>
@@ -402,6 +402,7 @@ export default {
 			this.iniPieChart(this.chartData);
 		},
 		setPieData2() {
+			console.log(this.pieData2)
 			let data = [...this.pieData2.list];
 			let type = {
 				1: '出租',

src/views/modules/census/census-orgStatusList.vue

@@ -18,6 +18,32 @@
 							></el-cascader>
 						</el-form-item>
 
+						<el-form-item label="" prop="startDate">
+							<el-date-picker
+								v-model="formData.startDate"
+								:picker-options="startPickerOptions"
+								class="item_width_2"
+								size="small"
+								type="date"
+								value-format="yyyy-MM-dd HH:mm:ss"
+								value="yyyy-MM-dd"
+								placeholder="开始时间"
+								@change="handleSearch"
+							></el-date-picker>
+							<span class="data-tag">至</span>
+							<el-date-picker
+								v-model="formData.endDate"
+								:picker-options="endPickerOptions"
+								class="item_width_2 data-tag"
+								size="small"
+								type="date"
+								value-format="yyyy-MM-dd HH:mm:ss"
+								value="yyyy-MM-dd"
+								placeholder="结束时间"
+								@change="handleSearch"
+							></el-date-picker>
+						</el-form-item>
+
 						<el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
 					</div>
 				</el-form>
@@ -74,38 +100,7 @@
 			<el-row :gutter="20">
 				<el-col :span="24">
 					<div class="div_table">
-						<div class="div_table_title">
-							下级社区数量统计
-							<el-form :inline="true" :model="formData2" ref="ref_searchform2" :label-width="'80px'" style="display: inline-block;margin-left: 20px;">
-								<div>
-									<el-form-item label="" prop="startDate">
-										<el-date-picker
-											v-model="formData2.startDate"
-											:picker-options="startPickerOptions"
-											class="item_width_2"
-											size="small"
-											type="date"
-											value-format="yyyy-MM-dd HH:mm:ss"
-											value="yyyy-MM-dd"
-											placeholder="开始时间"
-											@change="handleSearch"
-										></el-date-picker>
-										<span class="data-tag">至</span>
-										<el-date-picker
-											v-model="formData2.endDate"
-											:picker-options="endPickerOptions"
-											class="item_width_2 data-tag"
-											size="small"
-											type="date"
-											value-format="yyyy-MM-dd HH:mm:ss"
-											value="yyyy-MM-dd"
-											placeholder="结束时间"
-											@change="handleSearch"
-										></el-date-picker>
-									</el-form-item>
-								</div>
-							</el-form>
-						</div>
+						<div class="div_table_title">下级社区数量统计</div>
 						<div :style="'height:' + TableHeight + 'px;margin-top:20px'" :h="maxTableHeight">
 							<screen-echarts-frame
 								@handelClickMyPei="handelClickMyPei"
@@ -156,8 +151,8 @@ export default {
 		let endDisabledDate = time => {
 			//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
 			let nowData = Date.now();
-			if (this.formData2.startDate) {
-				let startDate = new Date(this.formData2.startDate);
+			if (this.formData.startDate) {
+				let startDate = new Date(this.formData.startDate);
 				return time.getTime() > nowData || time.getTime() < startDate || time.getTime() === startDate;
 			} else {
 				return time.getTime() > nowData;
@@ -196,12 +191,11 @@ export default {
 			censusData: { district: '', street: '', community: '', grid: '', staff: '' },
 			formData: {
 				orgId: '',
-				level: ''
-			},
-			formData2: {
+				level: '',
 				startDate: '',
 				endDate: ''
 			},
+		
 			cateOptions: [],
 			eventTypeCheck: [],
 			pageNo: 1,
@@ -239,10 +233,10 @@ export default {
 		...mapGetters(['clientHeight', 'iframeHeight'])
 	},
 	watch: {
-		'formData2.endDate': function(val) {
+		'formData.endDate': function(val) {
 			if (val && val != '') {
 				let arrayTemp = val.split(' ');
-				this.formData2.endDate = arrayTemp[0] + ' 23:59:59';
+				this.formData.endDate = arrayTemp[0] + ' 23:59:59';
 			}
 		}
 	},
@@ -283,8 +277,8 @@ export default {
 			url = '/gov/org/customeragency/getCommunityList';
 			param = {
 				agencyId: this.orgId,
-				timeStart: this.formData2.startDate,
-				timeEnd: this.formData2.endDate,
+				timeStart: this.formData.startDate,
+				timeEnd: this.formData.endDate,
 				pageNum: this.pageNo,
 				pageSize: this.pageSize
 			};
@@ -385,7 +379,7 @@ export default {
 			} else {
 				agencyId = this.agencyId;
 			}
-			const { data, code, msg } = await requestPost(url, { agencyId: agencyId, timeStart: this.formData2.startDate, timeEnd: this.formData2.endDate });
+			const { data, code, msg } = await requestPost(url, { agencyId: agencyId, timeStart: this.formData.startDate, timeEnd: this.formData.endDate });
 
 			this.$refs.pieChart.hideLoading();