修复前端可视化bug

src/views/dataBoard/overview/components/EventDispatchOrder.vue

@@ -279,10 +279,11 @@ export default {
     },
     handleSure() {
       console.log(this.form)
-      this.$http.post('/governance/icEvent/reply', {
+      this.$http.post('/governance/icEventOld/reply', {
         ...this.form,
         files: this.fileList,
-        icEventId: this.detail.icEventId
+        icEventId: this.detail.icEventId,
+        status:"processing",
       }).then(res => {
         this.handleClose()
         this.$message.success('操作成功')

src/views/dataBoard/overview/dissatisfiedProblemNumber/12345Hotline.vue

@@ -20,11 +20,11 @@
             {{ $sensitive(scope.row.mobile, 3, 7) }}
           </template>
         </el-table-column>
-        <el-table-column label="状态" prop="operationTypeName"/>
+        <el-table-column label="状态" prop="statusName"/>
         <el-table-column label="操作" min-width="150px">
           <template slot-scope="{row}">
             <CallPhone text="拨打电话"/>
-            <span class="handle" @click="handleDispatch(row)">处理</span>
+            <span v-if="row.status === 'processing'" class="handle" @click="handleDispatch(row)">处理</span>
             <span class="view" @click="handleView(row)">查看</span>
           </template>
         </el-table-column>

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

@@ -27,7 +27,7 @@
                           </div>
                         </div>-->
 
-            <div class="new-number-item" @click="toListPage('self', '自住')">
+            <div class="new-number-item" @click="toListPage(0, '自住')">
               <div class="title">自住房屋</div>
               <div class="numbers">
                 <div class="num color1">
@@ -36,7 +36,7 @@
                 <div class="unit">户</div>
               </div>
             </div>
-            <div class="new-number-item" @click="toListPage('lease', '出租')">
+            <div class="new-number-item" @click="toListPage(1, '出租')">
               <div class="title">出租房屋</div>
               <div class="numbers">
                 <div class="num color2"> {{ pandectData.rentOut }}</div>
@@ -44,7 +44,7 @@
               </div>
             </div>
 
-            <div class="new-number-item" @click="toListPage('unused', '闲置')">
+            <div class="new-number-item" @click="toListPage(2, '闲置')">
               <div class="title">闲置房屋</div>
               <div class="numbers">
                 <div class="num color3">{{ pandectData.vacantHouse }}</div>

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

@@ -27,7 +27,7 @@
                             <div class="unit">人</div>
                           </div>
                         </div>-->
-            <div class="new-number-item" @click="toListPage('permanent', '常住人口')">
+            <div class="new-number-item" @click="toListPage('0', '常住人口')">
               <div class="title">常住人口</div>
               <div class="numbers">
                 <div class="num color1">
@@ -36,7 +36,7 @@
                 <div class="unit">人</div>
               </div>
             </div>
-            <div class="new-number-item" @click="toListPage('float', '流动人口')">
+            <div class="new-number-item" @click="toListPage('1', '流动人口')">
               <div class="title">流动人口</div>
               <div class="numbers color2">
                 <div class="num">{{ pandectData.floatingResiCount }}</div>

src/views/dataBoard/renfang/house/list.vue

@@ -36,7 +36,7 @@
 import cptTb from "@/views/dataBoard/cpts/tb";
 import cptBread from "@/views/dataBoard/renfang/cpts/bread";
 import houseDetails from "@/views/dataBoard/cpts/house-details";
-import { requestPostBi } from "@/js/dai/request-bipass";
+import { requestPost } from "@/js/dai/request";
 import getQueryPara from "dai-js/modules/getQueryPara";
 
 export default {
@@ -69,7 +69,7 @@ export default {
 
       orgLevel: "",
       org_id: "",
-      houseType: "", // 流动 常驻 全部
+      houseType: 0, // 流动 常驻 全部
 
       loading: true,
       pageSize: parseInt(localStorage.getItem("dataBoard_PageSize")) || 20,
@@ -156,7 +156,6 @@ export default {
     this.tableTitle = type_name + "房屋列表";
     this.pageNo = 1;
     this.getList();
-    this.getCount();
   },
   methods: {
     handleRouter() {
@@ -174,7 +173,7 @@ export default {
 
     showInfo(index) {
       let item = this.srcTableData[index];
-      this.displayedHouseId = item.house_id;
+      this.displayedHouseId = item.houseId;
     },
 
     handlePageNoChange(pageNo) {
@@ -193,18 +192,17 @@ export default {
       const { org_id, houseType, pageNo, pageSize } = this;
       this.loading = true;
 
-      const url = "house_list";
+      const url = "/actual/base/communityHouse/listHouses";
 
-      const { data, code, msg } = await requestPostBi(
+      const { data, code, msg } = await requestPost(
         url,
         {
-          queryParam: {
+            id:org_id,
-            org_id,
+            rentFlag: this.houseType,
-            type: houseType,
+            level: "agency",
             pageNo,
             pageSize,
         },
-        },
         {
           // mockId: 60068051,
         }
@@ -213,51 +211,27 @@ export default {
       this.loading = false;
 
       if (code === 0) {
-        this.srcTableData = data;
+        this.srcTableData = data.list;
-        // this.total = data.total;
+        this.total = data.total;
 
-        this.list = data.map((item, index) => {
+        this.list = data.list.map((item, index) => {
           return [
             index + 1,
-            item.village ? item.village : "--",
+            item.neighborHoodName ? item.neighborHoodName : "--",
-            item.building ? item.building : "--",
+            item.buildingName ? item.buildingName : "--",
-            item.unit ? item.unit : "--",
+            item.unitNum ? item.unitNum : "--",
-            item.door ? item.door : "--",
+            item.houseName ? item.houseName : "--",
-            item.house_type ? item.house_type : "--",
+            item.houseType ? item.houseType : "--",
-            item.house_usage ? item.house_usage : "--",
+            item.purpose ? item.purpose : "--",
-            item.house_state ? item.house_state : "--",
+            item.rentFlag ? item.rentFlag : "--",
-            item.holder_name ? item.holder_name : "--",
+            item.ownerName ? item.ownerName : "--",
-            item.holder_phone ? item.holder_phone : "--",
+            item.ownerPhone ? item.ownerPhone : "--",
-            item.holder_idcard ? item.holder_idcard : "--",
+            item.ownerIdCard ? item.ownerIdCard : "--",
 
             { type: "operate", list: ["查看"] },
           ];
         });
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    async getCount() {
-      const { org_id, houseType, pageNo, pageSize } = this;
-      const url = "house_list_total";
         
-      const { data, code, msg } = await requestPostBi(
-        url,
-        {
-          queryParam: {
-            org_id,
-            type: houseType,
-            pageNo,
-            pageSize,
-          },
-        },
-        {
-          // mockId: 63070189,
-        }
-      );
-
-      if (code === 0) {
-        this.total = parseInt(data[0].count);
       } else {
         this.$message.error(msg);
       }

src/views/dataBoard/renfang/resi/list.vue

@@ -34,7 +34,7 @@
 import cptTb from "@/views/dataBoard/cpts/tb";
 import cptBread from "@/views/dataBoard/renfang/cpts/bread";
 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";
 
 export default {
@@ -140,7 +140,6 @@ export default {
 
     this.pageNo = 1;
     this.getList();
-    this.getCount();
   },
 
   methods: {
@@ -169,21 +168,18 @@ export default {
     },
 
     async getList () {
-      const { org_id, resiType, pageNo, pageSize } = this;
+      const { resiType, pageNo, pageSize } = this;
       this.loading = true;
 
-      const url = "resident_list";
+      const url = "/actual/base/residentBaseInfo/page";
 
-      const { data, code, msg } = await requestPostBi(
+      const { data, code, msg } = await requestPost(
         url,
         {
-          queryParam: {
+            floatType: resiType,
-            org_id,
-            type: resiType,
             pageNo,
             pageSize,
         },
-        },
         {
           // mockId: 60069169,
         }
@@ -193,17 +189,17 @@ export default {
 
       if (code === 0) {
         this.srcTableData = data;
-        // this.total = data.total;
+        this.total = data.total;
 
-        this.list = data.map((item, index) => {
+        this.list = data.list.map((item, index) => {
           return [
             index + 1,
-            item.user_name ? item.user_name : "--",
+            item.name ? item.name : "--",
-            item.grid ? item.grid : "--",
+            item.gridName ? item.gridName : "--",
-            item.house ? item.house : "--",
+            item.homeName ? item.homeName : "--",
-            item.telephone ? item.telephone : "--",
+            item.mobile ? item.mobile : "--",
-            item.idcard ? item.idcard : "--",
+            item.idNum ? item.idNum : "--",
-            item.gender ? item.gender : "--",
+            item.gender === "1" ? "男" : (item.gender === "2" ? "女" : "--"),
             item.birthday ? item.birthday : "--",
 
             { type: "operate", list: ["查看"] },
@@ -213,33 +209,6 @@ export default {
         this.$message.error(msg);
       }
     },
-
-    async getCount () {
-      const { org_id, resiType, pageNo, pageSize } = this;
-
-      const url = "resident_list_total";
-
-      const { data, code, msg } = await requestPostBi(
-        url,
-        {
-          queryParam: {
-            org_id,
-            type: resiType,
-            pageNo,
-            pageSize,
-          },
-        },
-        {
-          // mockId: 63070408,
-        }
-      );
-
-      if (code === 0) {
-        this.total = parseInt(data[0].count);
-      } else {
-        this.$message.error(msg);
-      }
-    },
   },
 
   destroyed () {

src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue

@@ -2,7 +2,7 @@
   <div class="personnel-portrait" v-loading="loading" element-loading-text="加载中..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(0,0,0,0.5)">
     <Tabs v-model="resultType" :list="resultTypeList" @changeVal="resultTypeChange" />
     <div class="screen">
-      <div class="txt">不满意人员画像</div>
+      <div class="txt">已有不满意人群画像</div>
       <el-select v-if="resultType == 'provinceAndSelf'" v-model="typeCondition" @change="getData" placeholder="请选择" class="select" popper-class="selectPopClass">
         <el-option v-for="item in typeConditionList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
       </el-select>
@@ -24,6 +24,11 @@
           {{ residentTag }}
         </div>
       </div>
+      <div class="tag green" v-if="service">
+        <div :class="[service.length > 5 ? 'smallSize' : '', 'text']">
+          {{ service }}
+        </div>
+      </div>
       <div class="tag light" v-if="monthIncomeLevel">
         <div :class="[monthIncomeLevel.length > 5 ? 'smallSize' : '', 'text']">
           {{ monthIncomeLevel }}
@@ -96,6 +101,7 @@ export default {
       ageClassification: "",
       cultureName: "",
       gridName: "",
+      service: "",
       monthIncomeLevel: "",
       residentTagArray:[],
       matchPeopleNum: 0,
@@ -117,6 +123,7 @@ export default {
         this.ageClassification = "";
         this.cultureName = "";
         this.gridName = "";
+        this.service = "";
         this.monthIncomeLevel = "";
         this.residentTagArray = [];
         this.matchPeopleNum = 0;
@@ -160,6 +167,7 @@ export default {
         this.ageClassification = data.ageClassification;
         this.cultureName = data.cultureName;
         this.gridName = data.gridName;
+        this.service = data.service;
         this.monthIncomeLevel = data.monthIncomeLevel;
         if(data.residentTagName){
           this.residentTagArray = data.residentTagName.split(",");

src/views/dataBoard/satisfactionEval/potentialPeople/index.vue

@@ -245,7 +245,7 @@ export default {
       console.log(this.queryParams);
       let params = {
         ...this.queryParams,
-        countType: this.$route.query.countType,
+        // countType: this.$route.query.countType,
       };
       console.log(params);
       this.$http