Merge branch 'jw_feature_dev' into jw_feature_zhangruochen

src/assets/scss/dataBoard/overview/index.scss

@@ -47,7 +47,7 @@
 }
 
 .m-rybox {
-	width: 884px;
+	width: 910px;
 }
 
 .m-subbox {
@@ -354,6 +354,7 @@
 
 .m-jdwgy {
 	height: auto!important;
+	width: 100%;
 	padding: 12px 16px;
 }
 

src/views/dataBoard/overview/index.vue

@@ -8,26 +8,86 @@
     <div class="g-row">
       <div class="g-left">
         <div class="m-box">
-          <title-box :text="`${currentLevel === 'district' ? '区' : currentLevel === 'street' ? '街道' : currentLevel === 'community' ? '社区' : currentLevel === 'grid' ? '网格' : ''}介绍`" />
+          <title-box
+            :text="`${
+              currentLevel === 'district'
+                ? '区'
+                : currentLevel === 'street'
+                ? '街道'
+                : currentLevel === 'community'
+                ? '社区'
+                : currentLevel === 'grid'
+                ? '网格'
+                : ''
+            }介绍`"
+          />
           <jdjs :currentLevelData="currentLevelData" />
         </div>
 
         <div class="m-box">
-          <title-box :text="`${currentLevel === 'district' ? '区' : currentLevel === 'street' ? '街道' : currentLevel === 'community' ? '社区' : currentLevel === 'grid' ? '网格' : ''}图谱画像`" />
+          <title-box
+            :text="`${
+              currentLevel === 'district'
+                ? '区'
+                : currentLevel === 'street'
+                ? '街道'
+                : currentLevel === 'community'
+                ? '社区'
+                : currentLevel === 'grid'
+                ? '网格'
+                : ''
+            }图谱画像`"
+          />
           <jdtphx :currentLevelData="currentLevelData" :id="orgId" />
         </div>
       </div>
       <div class="g-center">
-        <div class="m-map" style="overflow: hidden">
-          <map-top :currentLevelData="currentLevelData" @changeType="changeType" :level="currentLevel" />
+        <div
+          :class="listShow ? 'm-map' : 'g-center-open'"
+          style="overflow: hidden"
+        >
+          <map-top
+            :currentLevelData="currentLevelData"
+            @changeType="changeType"
+            :level="currentLevel"
+          />
           <div v-if="breadList.length > 1" class="go-back" @click="goBackMap">
             <img src="~@/assets/images/shuju/overview/go-back.png" />
           </div>
-          <grid-map ref="map" @clickAgency="clickAgencyItem" :srcGridData="orgData" @clickDotBtn="handleClickDotBtn" :level="currentLevel" :peopleType="peopleType" />
+          <grid-map
+            ref="map"
+            @clickAgency="clickAgencyItem"
+            :srcGridData="orgData"
+            @clickDotBtn="handleClickDotBtn"
+            :level="currentLevel"
+            :peopleType="peopleType"
+          />
         </div>
         <div class="m-box m-rybox">
-          <title-box :text="`${customerName}${peopleList[peopleType]}`" />
-          <jdwgy :peopleType="peopleType" :currentLevelData="currentLevelData" :level="currentLevel" @setNum="setNum" @setPoint="setPoint" />
+          <title-box :text="`${customerName}${peopleList[peopleType]}`">
+            <div class="up-style" style="width: 51%">
+              <div>
+                <img
+                  v-if="listShow"
+                  @click="upDownShow"
+                  src="~@/assets/images/overview/down-icon.png"
+                />
+                <img
+                  v-else
+                  @click="upDownShow"
+                  src="~@/assets/images/overview/up-icon.png"
+                />
+              </div>
+            </div>
+          </title-box>
+          <jdwgy
+            v-show="listShow"
+            :peopleType="peopleType"
+            :currentLevelData="currentLevelData"
+            :level="currentLevel"
+            @setNum="setNum"
+            @setPoint="setPoint"
+          />
         </div>
       </div>
 
@@ -37,57 +97,136 @@
           <rfsjtj :currentLevelData="currentLevelData" />
         </div>
         <!-- 街道概览 -->
-        <div v-if="currentLevel === 'street' || currentLevel === 'district'" class="m-box">
+        <div
+          v-if="currentLevel === 'street' || currentLevel === 'district'"
+          class="m-box"
+        >
           <title-box text="各社区人房数据更新排行">
             <span class="date-span">
-              <el-date-picker v-model="rfphDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate" type="month" :clearable="false" placeholder="选择月"> </el-date-picker>
+              <el-date-picker
+                v-model="rfphDate"
+                format="yyyy-MM"
+                value-format="yyyy-MM"
+                @change="changeDate"
+                type="month"
+                :clearable="false"
+                placeholder="选择月"
+              >
+              </el-date-picker>
             </span>
           </title-box>
           <sqrfph :currentLevelData="currentLevelData" :date="rfphDate" />
         </div>
-        <div v-if="currentLevel === 'street' || currentLevel === 'district'" class="m-box">
+        <div
+          v-if="currentLevel === 'street' || currentLevel === 'district'"
+          class="m-box"
+        >
           <title-box text="各社区12345投诉事件统计">
             <span class="date-span">
-              <el-date-picker v-model="sq12345Date" format="yyyy-MM" value-format="yyyy-MM" type="month" :clearable="false" placeholder="选择月" />
+              <el-date-picker
+                v-model="sq12345Date"
+                format="yyyy-MM"
+                value-format="yyyy-MM"
+                type="month"
+                :clearable="false"
+                placeholder="选择月"
+              />
             </span>
           </title-box>
           <sq12345 :currentLevelData="currentLevelData" :date="sq12345Date" />
         </div>
 
         <!-- 社区&网格-->
-        <div v-if="currentLevel === 'community' || currentLevel === 'grid'" class="m-box">
+        <div
+          v-if="currentLevel === 'community' || currentLevel === 'grid'"
+          class="m-box"
+        >
           <title-box text="人房数据动态更新" />
-          <Tabs v-model="dynamicType" :list="dynamicTypeList" v-if="currentLevel === 'community'" @changeVal="dynamicTypeChange" />
-          <DynamicHumanRoomData :currentLevelData="currentLevelData" :currentLevel="currentLevel" v-if="dynamicType === 1" />
-          <GridUpdateRanking :currentLevelData="currentLevelData" :currentLevel="currentLevel" v-if="dynamicType === 2" />
+          <Tabs
+            v-model="dynamicType"
+            :list="dynamicTypeList"
+            v-if="currentLevel === 'community'"
+            @changeVal="dynamicTypeChange"
+          />
+          <DynamicHumanRoomData
+            :currentLevelData="currentLevelData"
+            :currentLevel="currentLevel"
+            v-if="dynamicType === 1"
+          />
+          <GridUpdateRanking
+            :currentLevelData="currentLevelData"
+            :currentLevel="currentLevel"
+            v-if="dynamicType === 2"
+          />
         </div>
         <!-- 社区概览-->
         <div v-if="currentLevel === 'community'" class="m-box">
           <title-box text="社区满意度自查结果">
             <span class="date-span">
-              <el-date-picker v-model="sqzcDate" format="yyyy-MM" value-format="yyyy-MM" type="month" :clearable="false" placeholder="选择月" />
+              <el-date-picker
+                v-model="sqzcDate"
+                format="yyyy-MM"
+                value-format="yyyy-MM"
+                type="month"
+                :clearable="false"
+                placeholder="选择月"
+              />
             </span>
           </title-box>
-          <CommunityResult :currentLevelData="currentLevelData" :date="sqzcDate" />
+          <CommunityResult
+            :currentLevelData="currentLevelData"
+            :date="sqzcDate"
+          />
         </div>
         <div v-if="currentLevel === 'community'" class="m-box">
           <title-box text="事件&回访">
             <span class="date-span">
-              <el-date-picker v-model="sjhfDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate" type="month" :clearable="false" placeholder="选择月" />
+              <el-date-picker
+                v-model="sjhfDate"
+                format="yyyy-MM"
+                value-format="yyyy-MM"
+                @change="changeDate"
+                type="month"
+                :clearable="false"
+                placeholder="选择月"
+              />
             </span>
           </title-box>
-          <Tabs v-model="eventType" :list="eventTypeList" @changeVal="eventTypeChange" />
-          <EventAndFollowUp :currentLevelData="currentLevelData" :date="sjhfDate" v-if="eventType === 1" />
-          <FollowUp :currentLevelData="currentLevelData" :date="sjhfDate" v-if="eventType === 2" />
+          <Tabs
+            v-model="eventType"
+            :list="eventTypeList"
+            @changeVal="eventTypeChange"
+          />
+          <EventAndFollowUp
+            :currentLevelData="currentLevelData"
+            :date="sjhfDate"
+            v-if="eventType === 1"
+          />
+          <FollowUp
+            :currentLevelData="currentLevelData"
+            :date="sjhfDate"
+            v-if="eventType === 2"
+          />
         </div>
         <!-- 网格 -->
         <div v-if="currentLevel === 'grid'" class="m-box">
           <title-box text="社区网格数据更新情况排行">
             <span class="date-span">
-              <el-date-picker v-model="sqwggxDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate" type="month" :clearable="false" placeholder="选择月" />
+              <el-date-picker
+                v-model="sqwggxDate"
+                format="yyyy-MM"
+                value-format="yyyy-MM"
+                @change="changeDate"
+                type="month"
+                :clearable="false"
+                placeholder="选择月"
+              />
             </span>
           </title-box>
-          <RankingGridData :currentLevelData="currentLevelData" :date="sqwggxDate" />
+          <RankingGridData
+            :currentLevelData="currentLevelData"
+            :date="sqwggxDate"
+          />
         </div>
       </div>
     </div>
@@ -235,7 +374,8 @@ export default {
 
   methods: {
     changeCustomerName() {
-      this.customerName = localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
+      this.customerName =
+        localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
     },
     changeType(e) {
       this.peopleType = e;
@@ -290,7 +430,8 @@ export default {
           orgLevel: item.level,
         };
       } else {
-        this.customerName = localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
+        this.customerName =
+          localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
         this.currentLevelData = {
           ...this.$store.state.chooseArea.chooseName,
           orgLevel: this.$store.state.chooseArea.chooseName.level,
@@ -326,7 +467,10 @@ export default {
       if (!item.longitude) {
         return this.$message.error("请先设置坐标");
       }
-      this.$refs.map.setDotMarker(item, [parseFloat(item.longitude), parseFloat(item.latitude)]);
+      this.$refs.map.setDotMarker(item, [
+        parseFloat(item.longitude),
+        parseFloat(item.latitude),
+      ]);
     },
     setNum(data) {
       // data
@@ -357,19 +501,25 @@ export default {
       // }
     },
     //获取地图上显示的组织数据
-    async getMapData(orgId = this.$store.state.chooseArea.chooseName.orgId, level = this.$store.state.chooseArea.chooseName.level) {
+    async getMapData(
+      orgId = this.$store.state.chooseArea.chooseName.orgId,
+      level = this.$store.state.chooseArea.chooseName.level
+    ) {
       const url = "org_map";
-      this.$http.post(`/gov/org/agency/maporg`, { orgId, level }).then(({ data: { data } }) => {
-        this.orgData = data;
-        this.orgId = this.orgData.id;
-        this.orgLevel = this.orgData.level;
-        this.currentLevel = this.orgData.agencyLevel;
-        this.currentLevelData = {
-          orgId: this.orgId,
-          orgLevel: this.currentLevel,
-        };
-        this.peopleType = this.currentLevel === "grid" ? "unit" : "staffAgency";
-      });
+      this.$http
+        .post(`/gov/org/agency/maporg`, { orgId, level })
+        .then(({ data: { data } }) => {
+          this.orgData = data;
+          this.orgId = this.orgData.id;
+          this.orgLevel = this.orgData.level;
+          this.currentLevel = this.orgData.agencyLevel;
+          this.currentLevelData = {
+            orgId: this.orgId,
+            orgLevel: this.currentLevel,
+          };
+          this.peopleType =
+            this.currentLevel === "grid" ? "unit" : "staffAgency";
+        });
     },
 
     //获取地图上显示的组织数据
@@ -463,7 +613,11 @@ export default {
   background: #000;
 }
 </style>
-<style lang="scss" src="@/assets/scss/dataBoard/overview/index.scss" scoped></style>
+<style
+  lang="scss"
+  src="@/assets/scss/dataBoard/overview/index.scss"
+  scoped
+></style>
 
 <style lang="scss" scoped>
 .tabs {

src/views/dataBoard/renfang/cpts/fwgl.vue

@@ -7,6 +7,7 @@
 						class=""
 						@myChartMethod="pieInitOk"
 						ref="pieChart"
+						v-if="pandectData.homeCount"
 					></screen-echarts-frame>
 				</div>
 				<div class="pie-legend">
@@ -35,7 +36,7 @@
 								<div class="title">房屋总数</div>
 							</div>
 							<div class="item-two">
-								<div class="num">{{ info.house_count }}</div>
+								<div class="num">{{ pandectData.homeCount }}</div>
 								<div class="unit">户</div>
 							</div>
 						</div>
@@ -54,7 +55,7 @@
 							</div>
 							<div class="item-two">
 								<div class="num">
-									{{ info.self_dwelling_count }}
+									{{ pandectData.selfStay }}
 								</div>
 								<div class="unit">户</div>
 							</div>
@@ -74,7 +75,7 @@
 								<div class="title">出租房屋</div>
 							</div>
 							<div class="item-two">
-								<div class="num">{{ info.lease_count }}</div>
+								<div class="num">  {{pandectData.rentOut}}</div>
 								<div class="unit">户</div>
 							</div>
 						</div>
@@ -92,7 +93,7 @@
 								<div class="title">闲置房屋</div>
 							</div>
 							<div class="item-two">
-								<div class="num">{{ info.unused_count }}</div>
+								<div class="num">{{ pandectData.vacantHouse }}</div>
 								<div class="unit">户</div>
 							</div>
 						</div>
@@ -166,10 +167,13 @@ export default {
 				lease_count: 0,
 				unused_count: 0,
 			},
+			pandectData:{}
 		};
 	},
 	mounted() {
-		this.getData();
+			this.$nextTick(()=>{
+				this.getData();
+			})
 	},
 	watch: {
 		orgId() {
@@ -196,8 +200,9 @@ export default {
 		},
 		async getData() {
 			await this.getInfo();
+			 this.getPie();
 			this.getBar();
-			this.getPie();
+		
 		},
 		getBar() {
 			if (this.barInitState) {
@@ -251,25 +256,23 @@ export default {
 			}
 		},
 		// 获取饼状图
-		async iniPieChart() {
+		 iniPieChart() {
 			this.$refs.pieChart.clear();
-			// this.$refs.pieChart.showLoading()
-
 			// 获取pieChart配置
 			this.pieOption = pieOption();
-
-			const { info } = this;
+			const {pandectData} = this
+			console.log(pandectData);
 			// 设置三个配置值
 			this.pieOption.title.text =
-				(info.house_count != 0
+				(pandectData.homeCount != 0
 					? parseInt(
-							(100 * info.self_dwelling_count) / info.house_count
+							(100 *  pandectData.selfStay) / pandectData.homeCount
 					  )
 					: "--") + "%";
 			this.pieData = [
-				{ value: info.self_dwelling_count, name: "自住房屋" },
-				{ value: info.lease_count, name: "出租房屋" },
-				{ value: info.unused_count, name: "闲置房屋" },
+				{ value:  pandectData.selfStay, name: "自住房屋" },
+				{ value: pandectData.rentOut, name: "出租房屋" },
+				{ value: pandectData.vacantHouse, name: "闲置房屋" },
 			];
 			this.pieOption.series[0].data = this.pieData;
 			this.$refs.pieChart.setOption(this.pieOption);
@@ -282,21 +285,21 @@ export default {
 					fromActionPayload: { dataIndexInside },
 				} = params;
 				this.pieOption.title.text =
-					(info.house_count != 0
+					(pandectData.homeCount != 0
 						? parseInt(
 								(100 *
 									[
-										info.self_dwelling_count,
-										info.lease_count,
-										info.unused_count,
+									pandectData.selfStay,
+									pandectData.rentOut,
+									pandectData.vacantHouse,
 									][dataIndexInside]) /
-									info.house_count
+									pandectData.homeCount
 						  )
 						: "--") + "%";
 				this.$refs.pieChart.myChart.setOption(this.pieOption);
 			});
 		},
-
+		
 		// 获取房屋总数等
 		async getBarData() {
 			const url = "house_trend";

src/views/dataBoard/renfang/index.vue

@@ -17,7 +17,7 @@
           </div>
 
           <div class="m-subbox">
-            <fwgl :orgId="orgData.org_id"></fwgl>
+            <fwgl ref="fwgl" :orgId="orgData.org_id" :pandectData="pandectData"></fwgl>
           </div>
         </div>
 
@@ -31,7 +31,7 @@
           </div>
 
           <div class="m-subbox">
-            <jmgl :orgId="orgData.org_id"></jmgl>
+            <jmgl :orgId="orgData.org_id" :pandectData="pandectData"></jmgl>
           </div>
         </div>
       </div>
@@ -438,6 +438,8 @@ import resiDetails from "@/views/dataBoard/cpts/resi-details";
 import { requestPostBi } from "@/js/dai/request-bipass";
 import { requestPost } from "@/js/dai/request";
 import getQueryPara from "dai-js/modules/getQueryPara";
+import {requestGet} from "@/js/dai/request";
+import resiCategoryMap from "@/views/business/resi-category-map.js";
 
 function iniGetPerInfo() {
   return {
@@ -504,6 +506,8 @@ export default {
 
       displayedResiId: "",
       displayedHouseId: "",
+
+      pandectData: {},
     };
   },
 
@@ -531,10 +535,30 @@ export default {
       await this.getMapData();
       await this.getSubMapData();
       this.getResiCategoryData();
-      this.getResiCategoryForecastData();
       this.getPerInfo();
-
+      this.getResiCategoryForecastData();
+      this.getPandectData()
       this.loading = true;
+    },
+     //加载组织数据
+     async getPandectData() {
+      const url = "/actual/base/residentHouseMerge/communityOverview";
+      let params = {
+        // orgId: "",
+        // level: "",
+      };
+
+      const {data, code, msg} = await requestGet(url, params);
+      if (code === 0) {
+        if (data) {
+          this.$nextTick(()=>{
+            this.$refs['fwgl'].pandectData = data
+            }
+          )
+        }
+      } else {
+        this.$message.error(msg);
+      }
     },
     jumpPath(pageType, type_id = "", type_name) {
       this.$router.push({
@@ -729,31 +753,25 @@ export default {
 
     //居民分类预测数据
     async getResiCategoryForecastData() {
-      const url = "resident_class_predict";
-
-      const { data, code, msg } = await requestPostBi(
-        url,
-        {
-          queryParam: {
-            org_id: this.orgId,
-          },
-        },
-        {
-          // mockId: 60064667,
-        }
-      );
-
+      const url = "/actual/base/resiCategory/intelligentPredictioncategoryCountList";
+      let params = {
+      };
+      const {data, code, msg} = await requestGet(url, params);
       if (code === 0) {
-        this.resiCategoryForecastData = data.map((item) => {
-          return {
-            code: item.resident_type,
-            name: item.resident_type_name,
-            count: item.resident_count,
-            ratio: item.resident_ratio,
-            growth: item.change_count,
-            growthAbs: Math.abs(item.change_count),
-          };
-        });
+          this.resiCategoryForecastData = data.categoryList.map((item) => {
+            return {
+              code: item.categoryName,
+              name: resiCategoryMap[item.categoryName] || "",
+              count: item.categoryCountNext,
+              // name:item.categoryCountName,
+              per: parseInt(
+                (100 * item.categoryCount) / data.resiCount
+              ),
+              // per: item.change_ratio,
+              growth: item.change_ratio,
+              growthAbs: Math.abs(item.categoryCountNext - item.categoryCount)
+            };
+          });
       } else {
         this.$message.error(msg);
       }

src/views/modules/base/residentManagement/housingNature/housingNature.vue

@@ -216,7 +216,6 @@
           </el-table-column>
           <el-table-column prop="currentResidence"
                            align="center"
-                           width="150"
                            label="居住地址"
                            :show-overflow-tooltip="true">
           </el-table-column>
@@ -234,7 +233,7 @@
           </el-table-column>
           <el-table-column prop="subsidyNum"
                            align="center"
-                           width="100"
+                           width="200"
                            label="补贴编号"
                            :show-overflow-tooltip="true">
           </el-table-column>
@@ -246,7 +245,7 @@
           </el-table-column>
           <el-table-column prop="certificateDate"
                            align="center"
-                           width="100"
+                           width="200"
                            label="发证日期"
                            :show-overflow-tooltip="true">
           </el-table-column>
@@ -357,7 +356,7 @@ export default {
       showDetail: false,
       formType: "add",
       addDiaTitle: "新增",
-      detailDiaTitle: "详情",
+      detailDiaTitle: "编辑",
 
       multiSelection: [], // 多选结果
       importLoading: false,

src/views/modules/base/residentManagement/oldPeople/addForm.vue

@@ -8,7 +8,7 @@
                             <span class="info-title-2">所属组织: </span>
                             <span>{{ formData.agencyName || "--" }}</span>
                         </div>
-                        <el-form-item v-else label="所属组织" label-width="100px" prop="agencyId">
+                        <el-form-item v-else label="所属组织" label-width="104px" prop="agencyId">
                             <el-cascader v-if="formType == 'add'" ref="ref_cascader_agency" class="width-two"
                                 v-model="selGridId" :options="optionsA" @change="handleChangeAngency"
                                 :props="{ checkStrictly: true, emitPath: false, children: 'subAgencyList', label: 'agencyName', value: 'agencyId' }"
@@ -26,7 +26,7 @@
                             <span class="info-title-2">姓名: </span>
                             <span>{{ formData.name || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="姓名" prop="name" v-else>
+                        <el-form-item label-width="104px" label="姓名" prop="name" v-else>
                             <el-input v-model="formData.name" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
@@ -35,7 +35,7 @@
                             <span class="info-title-2">联系电话: </span>
                             <span>{{ formData.mobile || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="联系电话" v-else>
+                        <el-form-item label-width="104px" label="联系电话" v-else>
                             <el-input v-model="formData.mobile" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
@@ -47,7 +47,7 @@
                             <span class="info-title-2">证件类型: </span>
                             <span>{{ formData.idTypeName || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="证件类型" prop="idType" v-else>
+                        <el-form-item label-width="104px" label="证件类型" prop="idType" v-else>
                             <el-select v-model="formData.idType" clearable>
                                 <el-option v-for="item in dicts.idCard_type" :key="item.value" :label="item.label"
                                     :value="item.value">
@@ -60,7 +60,7 @@
                             <span class="info-title-2">证件号: </span>
                             <span>{{ formData.idNum || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="证件号" prop="idNum" v-else>
+                        <el-form-item label-width="104px" label="证件号" prop="idNum" v-else>
                             <el-input v-model="formData.idNum" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
@@ -80,7 +80,7 @@
                                 : "--"
                             }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="本地户籍" v-else>
+                        <el-form-item label-width="104px" label="本地户籍" v-else>
                             <el-select v-model="formData.localResidenceFlag" clearable>
                                 <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label"
                                     :value="item.value">
@@ -96,7 +96,7 @@
                             <span class="info-title-2">户籍地址: </span>
                             <span>{{ formData.placeOfDomicile || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="户籍地址" class="wd-wr" v-else>
+                        <el-form-item label-width="104px" label="户籍地址" class="wd-wr" v-else>
                             <el-input v-model="formData.placeOfDomicile" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
@@ -108,7 +108,7 @@
                             <span class="info-title-2">现居地址: </span>
                             <span>{{ formData.currentResidence || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="现居地址" class="wd-wr" v-else>
+                        <el-form-item label-width="104px" label="现居地址" class="wd-wr" v-else>
                             <el-input v-model="formData.currentResidence" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
@@ -128,7 +128,7 @@
                                 : "--"
                             }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="是否残疾" v-else>
+                        <el-form-item label-width="104px" label="是否残疾" v-else>
                             <el-select v-model="formData.disabilityFlag" clearable>
                                 <el-option v-for="item in binaryOptionList" :key="item.value" :label="item.label"
                                     :value="item.value">
@@ -141,7 +141,7 @@
                             <span class="info-title-2">残疾类别: </span>
                             <span>{{ formData.disabilityCategoryName || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="残疾类别" v-else>
+                        <el-form-item label-width="104px" label="残疾类别" v-else>
                             <el-select v-model="formData.disabilityCategoryCode" clearable>
                                 <el-option v-for="item in dicts.disability_category_code" :key="item.value"
                                     :label="item.label" :value="item.value">
@@ -158,7 +158,7 @@
                             <span class="info-title-2">残疾级别: </span>
                             <span>{{ formData.disabilityLevelName || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="残疾级别" v-else>
+                        <el-form-item label-width="104px" label="残疾级别" v-else>
                             <el-select v-model="formData.disabilityLevel" clearable>
                                 <el-option v-for="item in dicts.disability_level" :key="item.value" :label="item.label"
                                     :value="item.value">
@@ -171,7 +171,7 @@
                             <span class="info-title-2">残疾证号: </span>
                             <span>{{ formData.disabilityNum || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="残疾证号" v-else>
+                        <el-form-item label-width="104px" label="残疾证号" v-else>
                             <el-input v-model="formData.disabilityNum" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
@@ -183,7 +183,7 @@
                             <span class="info-title-2">与户主关系: </span>
                             <span>{{ formData.disabilityCategoryName || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="与户主关系" v-else>
+                        <el-form-item label-width="104px" label="与户主关系" v-else>
                             <el-select v-model="formData.houseHolderRel" clearable>
                                 <el-option v-for="item in dicts.resi_base_info" :key="item.value"
                                     :label="item.label" :value="item.value">
@@ -196,7 +196,7 @@
                             <span class="info-title-2">居住情况: </span>
                             <span>{{ formData.resideSituationName || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="居住情况" v-else>
+                        <el-form-item label-width="104px" label="居住情况" v-else>
                             <el-select v-model="formData.resideSituation" clearable>
                                 <el-option v-for="item in dicts.reside_situation" :key="item.value"
                                     :label="item.label" :value="item.value">
@@ -212,7 +212,7 @@
                             <span class="info-title-2">婚姻情况: </span>
                             <span>{{ formData.marriageName || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="婚姻情况" v-else>
+                        <el-form-item label-width="104px" label="婚姻情况" v-else>
                             <el-select v-model="formData.marriage" clearable>
                                 <el-option v-for="item in dicts.marriage" :key="item.value"
                                     :label="item.label" :value="item.value">
@@ -226,7 +226,7 @@
                             <span class="info-title-2">配偶情况: </span>
                             <span>{{ formData.spouseSituationName || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="配偶情况" v-else>
+                        <el-form-item label-width="104px" label="配偶情况" v-else>
                             <el-select v-model="formData.spouseSituation" clearable>
                                 <el-option v-for="item in dicts.spouse_situation" :key="item.value"
                                     :label="item.label" :value="item.value">
@@ -241,7 +241,7 @@
                             <span class="info-title-2">退休金额: </span>
                             <span>{{ formData.retirementAmount || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="退休金额" v-else>
+                        <el-form-item label-width="104px" label="退休金额" v-else>
                             <el-input v-model="formData.retirementAmount" placeholder="请输入" clearable
                                 @blur="checkNumberInput"></el-input>
                         </el-form-item>
@@ -251,7 +251,7 @@
                             <span class="info-title-2">高龄补助: </span>
                             <span>{{ formData.oldSubsidy || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="高龄补助" v-else>
+                        <el-form-item label-width="104px" label="高龄补助" v-else>
                             <el-input v-model="formData.oldSubsidy" placeholder="请输入" clearable
                                 ></el-input>
                         </el-form-item>
@@ -260,7 +260,7 @@
                 <el-row>
                     <el-col :span="12">
                         <div class="info-prop" v-if="formType == 'detail'">
-                            <span class="info-title-2">有无赡养老人: </span>
+                            <span class="info-title-2">有无赡养人: </span>
                             <span>{{
                                 formData.elderlyFlag != null
                                 ? formData.elderlyFlag === 1
@@ -271,7 +271,7 @@
                                 : "--"
                             }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="有无赡养老人" v-else>
+                        <el-form-item label-width="104px" label="有无赡养人" v-else>
                             <el-select v-model="formData.elderlyFlag" clearable>
                                 <el-option v-for="item in elderlyList" :key="item.value" :label="item.label"
                                     :value="item.value">
@@ -284,7 +284,7 @@
                             <span class="info-title-2">与赡养人关系: </span>
                             <span>{{ formData.elderlyRelationName || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="与赡养人关系" v-else>
+                        <el-form-item label-width="104px" label="与赡养人关系" v-else>
                             <el-select v-model="formData.elderlyRelation" clearable>
                                 <el-option v-for="item in dicts.resi_base_info" :key="item.value"
                                     :label="item.label" :value="item.value">
@@ -299,7 +299,7 @@
                             <span class="info-title-2">赡养人联系电话: </span>
                             <span>{{ formData.dependantMobile || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="赡养人联系电话" v-else>
+                        <el-form-item label-width="104px" label="赡养人联系电话" v-else>
                             <el-input v-model="formData.dependantMobile" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
@@ -311,7 +311,7 @@
                             <span class="info-title-2">备注: </span>
                             <span>{{ formData.remark || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="备注" class="wd-wr" v-else>
+                        <el-form-item label-width="104px" label="备注" class="wd-wr" v-else>
                             <el-input v-model="formData.remark" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>

src/views/modules/base/residentManagement/oldPeople/oldPeople.vue

@@ -304,7 +304,7 @@
               prop="elderlyFlag"
               align="center"
               width="100"
-              label="该居民有无赡养老人"
+              label="该居民有无赡养人"
               :show-overflow-tooltip="true"
             >
             <template slot-scope="scope">
@@ -475,8 +475,7 @@
         showEdit: false,
         showDetail: false,
         formType: "add",
-        addDiaTitle: "新增",
-        detailDiaTitle: "详情",
+        addDiaTitle: "",
   
         multiSelection: [], // 多选结果
         importLoading: false,
@@ -645,6 +644,7 @@
   
       //   编辑触发事件
       async handleEdit(row) {
+        this.addDiaTitle = "编辑";
         this.showAdd = true;
         this.$nextTick(() => {
           this.$refs.ref_add_form.initForm("edit", row);

src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue

@@ -588,6 +588,7 @@
   
       //   编辑触发事件
       async handleEdit(row) {
+        this.addDiaTitle = "编辑";
         this.showAdd = true;
         this.$nextTick(() => {
           this.$refs.ref_add_form.initForm("edit", row);

src/views/modules/base/residentManagement/resiDisability/addForm.vue

@@ -302,7 +302,7 @@
               <span class="info-title-2">月收入: </span>
               <span>{{ formData.monthIncome || "--" }}</span>
             </div>
-            <el-form-item label-width="100px" label="退休金额" v-else>
+            <el-form-item label-width="100px" label="月收入" v-else>
               <el-input
                 v-model="formData.monthIncome"
                 placeholder="请输入"

src/views/modules/base/residentManagement/resiDisability/resiDisability.vue

@@ -555,7 +555,6 @@ export default {
       //   showDetail: false,
       formType: "add",
       addDiaTitle: "新增",
-      detailDiaTitle: "详情",
 
       multiSelection: [], // 多选结果
       importLoading: false,
@@ -637,6 +636,7 @@ export default {
     },
     //   详情弹出框取消事件
     diaDetailClose() {
+      this.addDiaTitle = "编辑";
       this.$refs.ref_detail_form.diaDestroy();
       this.showDetail = false;
     },

src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue

@@ -417,7 +417,6 @@
         showDetail: false,
         formType: "add",
         addDiaTitle: "新增",
-        detailDiaTitle: "详情",
   
         multiSelection: [], // 多选结果
         importLoading: false,
@@ -587,6 +586,7 @@
   
       //   编辑触发事件
       async handleEdit(row) {
+        this.addDiaTitle = "编辑";
         this.showAdd = true;
         this.$nextTick(() => {
           this.$refs.ref_add_form.initForm("edit", row);

src/views/modules/base/residentManagement/tefu/tefuList.vue

@@ -270,7 +270,6 @@
           </el-table-column>
           <el-table-column prop="currentResidence"
                            align="center"
-                           width="150"
                            label="居住地址"
                            :show-overflow-tooltip="true">
           </el-table-column>
@@ -423,7 +422,6 @@ export default {
       showDetail: false,
       formType: "add",
       addDiaTitle: "新增",
-      detailDiaTitle: "详情",
 
       multiSelection: [], // 多选结果
       importLoading: false,

src/views/modules/base/residentManagement/unemployment/unemployment.vue

@@ -656,7 +656,6 @@ export default {
       showDetail: false,
       formType: "add",
       addDiaTitle: "新增",
-      detailDiaTitle: "详情",
 
       multiSelection: [], // 多选结果
       importLoading: false,

src/views/modules/base/residentManagement/veteran/veteran.vue

@@ -642,7 +642,6 @@ export default {
       showDetail: false,
       formType: "add",
       addDiaTitle: "新增",
-      detailDiaTitle: "详情",
 
       multiSelection: [], // 多选结果
       importLoading: false,
@@ -738,7 +737,7 @@ export default {
     },
     //   编辑触发事件
     async handleEdit(row) {
-      this.addDiaTitle = "详情";
+      this.addDiaTitle = "编辑";
       this.formType = "edit";
       this.showAdd = true;
       this.$nextTick(() => {

src/views/modules/base/residentManagement/volunteer/volunteer.vue

@@ -514,7 +514,6 @@ export default {
       showDetail: false,
       formType: "add",
       addDiaTitle: "新增",
-      detailDiaTitle: "详情",
 
       multiSelection: [], // 多选结果
       importLoading: false,

src/views/modules/communityParty/partyOrg/orgTree.vue

@@ -198,7 +198,9 @@ export default {
       });
     },
     rowClassName(row, rowIndex) {
+      console.log(row);
       if (row.row.childrenQty == 0) { 
+        console.log(row);
         return 'no-expand';
       }
       return '';
@@ -269,12 +271,13 @@ export default {
         }
 
         this.partyOrgTree=[]
-        this.partyOrgTree.push(data);
+        data.hasChildren = true
         data.children.forEach(item=>{
           if(item.childrenQty != 0){
             item.hasChildren = true
           }
         })
+        this.partyOrgTree.push(data);
         this.tableKey = new Date().getTime();
         // 默认加载2级，并且展开，从第三级开始，需要展开上一级动态查询得到
         console.log(">>>>", this.partyOrgTree)

src/views/modules/goverhotline/index.vue

@@ -106,15 +106,6 @@
               <el-table-column prop="content" align="center" label="投诉内容" :show-overflow-tooltip="true"></el-table-column>
             </el-table>
             
-            <div>
-              <h1 style="font-size: 24px; font-weight: bold;"> 四、工作改进举措 </h1>
-              <h2 style="font-size: 20px; font-weight: bold;"> 一是机制要“优”</h2>
-              <h2 style="font-size: 20px; font-weight: bold;"> 二是质量要“高”</h2>
-              <h2 style="font-size: 20px; font-weight: bold;"> 三是分流要“准”</h2>
-              <h2 style="font-size: 20px; font-weight: bold;"> 四是流程要“亚”</h2>
-              <h2 style="font-size: 20px; font-weight: bold;"> 五是沟通要“多</h2>
-              <h2 style="font-size: 20px; font-weight: bold;"> 六是模板要“精"</h2>
-            </div>
           </div>
 
          
@@ -590,11 +581,11 @@ export default {
 
             const url = '/governance/dwdEvent/report';
             const {formData } = this;
-            const { data, code, msg } = await requestPost(url, {
+            const { data, code, internalMsg } = await requestPost(url, {
               ...formData
             });
             if (code != 0) {
-              this.$message.error(msg);
+              this.$message.info(internalMsg);
               return;
             } 
             if (!data) {

src/views/modules/home/index.vue

@@ -226,7 +226,7 @@ import {mapGetters} from "vuex";
 import nextTick from "dai-js/tools/nextTick";
 import fastcall from "@/views/modules/cpts/fastcall";
 import * as echarts from 'echarts';
-import { requestPostBi } from "@/js/dai/request-bipass";
+
 export default {
   components: {fastcall},
 
@@ -274,9 +274,7 @@ export default {
 
       activeName: 'resi',
 
-      myChart: {},
-
-      resiCategoryData:[]
+      myChart: {}
     }
   },
   computed: {
@@ -360,35 +358,6 @@ export default {
       })
 
     },
-    async getResiCategoryData() {
-      const url = "resident_class_statics";
-
-      const { data, code, msg } = await requestPostBi(
-        url,
-        {
-          queryParam: {
-            org_id: this.$store.state.user.agencyId,
-          },
-        },
-        {
-          // mockId: 60031937,
-        }
-      );
-
-      if (code === 0) {
-          this.znycCategory.list = data.map((item) => {
-            return {
-              name: item.label,
-              count: item.count,
-              per: item.ratio,
-              const: "const",
-            };
-          });
-        console.log(this.resiCategoryData);
-      } else {
-        this.$message.error(msg);
-      }
-    },
     handleWindowResize() {
       if (this.myChart) {
         this.myChart.resize();
@@ -455,8 +424,7 @@ export default {
     async getApiData() {
       await this.getOrgData();
       this.getWarningList();
-      // this.getZnycList();
-      this.getResiCategoryData()
+      this.getZnycList();
       this.getPandectData();
       this.getNoticeData();
     },

src/views/modules/shequzhili/eventOld/eventList.vue

@@ -107,7 +107,7 @@
                         :auto-upload="true" :on-progress="handleProgress" :on-success="handleExcelSuccess"
                         :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest"
                         style="display: inline-block;margin:0px 10px">
-                        <el-button size="small" class="diy-button--white" :loading="importLoading">导入</el-button>
+                        <!-- <el-button size="small" class="diy-button--white" :loading="importLoading">导入</el-button> -->
                     </el-upload>
                     <el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
                     <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"