bug#965 bug#990 bug#987 bug#984 #bug974...

src/views/dataBoard/overview/familyPortrait/index.vue

@@ -43,11 +43,21 @@ export default {
   //   },
   // },
   activated() {
-    const { name, name2, id, buId, type } = this.$route.query;
-    this.breadcrumbList[1].name = name2;
-    this.breadcrumbList[2].name = name;
-    const url = type === "building" ? `/homeDetails/index?id=${id}&buId=${buId}&typeB=${type}` : `/homeDetails/index?id=${buId}&buId=${buId}&typeB=${type}`;
-    this.breadcrumbList[1].path = url;
+    const { name, name2, id, buId, type, orgId, type_name } = this.$route.query;
+    if (type === 'renfang') {
+      this.breadcrumbList[0].name = '人房数据';
+      this.breadcrumbList[0].path = '/dataBoard/renfang/index';
+      this.breadcrumbList[1].name = name2;
+      const url = `/dataBoard/renfang/house-list?org_id=${orgId}&type_name=${type_name}`;
+      this.breadcrumbList[1].path = url;
+      this.breadcrumbList[2].name = name;
+    } else {
+      this.breadcrumbList[1].name = name2;
+      this.breadcrumbList[2].name = name;
+      const url = type === "building" ? `/homeDetails/index?id=${id}&buId=${buId}&typeB=${type}` : `/homeDetails/index?id=${buId}&buId=${buId}&typeB=${type}`;
+      this.breadcrumbList[1].path = url;
+    }
+
   },
 };
 </script>
@@ -62,6 +72,7 @@ export default {
   padding-left: 26px;
   margin-bottom: 20px;
 }
+
 .breadcrumb {
   margin-bottom: 25px;
 }

src/views/dataBoard/overview/resident/index.vue

@@ -1,10 +1,6 @@
 <template>
   <div>
-    <cpt-bread
-      @tap="clickBreadItem"
-      v-if="breadList.length > 1"
-      :bread-list="breadList"
-    />
+    <cpt-bread @tap="clickBreadItem" v-if="breadList.length > 1" :bread-list="breadList" />
     <personnel />
   </div>
 </template>
@@ -12,6 +8,7 @@
 <script>
 import cptBread from "@/views/dataBoard/renfang/cpts/bread";
 import personnel from "@/views/dataBoard/cpts/personnel";
+import getQueryPara from 'dai-js/modules/getQueryPara';
 
 export default {
   name: "resident",
@@ -34,17 +31,64 @@ export default {
           meta: {
             title: "居民画像",
           },
-        },
+        }
       ],
+      type: '',
     };
   },
-  mounted() {},
-  watch: {},
+  mounted() {
+
+  },
+  activated() {
+
+    this.type = getQueryPara('type');
+    this.breadList = []
+    if (this.type === 'renfang') {
+      this.breadList = [
+        {
+          path: "/dataBoard/renfang/index",
+          meta: {
+            title: "人房数据",
+          },
+        },
+        {
+          type: 'back',
+          meta: {
+            title: "居民列表",
+          }
+        },
+        {
+          meta: {
+            title: "居民画像",
+          },
+        }
+      ]
+    } else {
+      this.breadList = [{
+        path: "/dataBoard/overview/index",
+        meta: {
+          title: "概览",
+        },
+      },
+      {
+        meta: {
+          title: "居民画像",
+        },
+      }];
+    }
+    console.log(this.type);
+  },
+
   methods: {
     clickBreadItem({ item }) {
-      this.$router.push({
-        path: item.path,
-      });
+      if (item.type === 'back') {
+        this.$router.back();
+      } else {
+        this.$router.push({
+          path: item.path,
+        });
+      }
+
     },
   },
 };

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

@@ -100,10 +100,19 @@ export default {
       this.getData();
     })
   },
-  watch: {
-    orgId() {
-      this.getData();
-    },
+    watch: {
+      // orgId() {
+      //   this.getData();
+      // },
+    pandectData: {
+      immediate: true,
+      deep:true,
+      handler(newData) {
+        this.pandectData = newData
+          this.iniPieChart();
+      }
+    }
+
   },
   methods: {
     toListPage(type = "", type_name = "") {

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

@@ -91,9 +91,17 @@ export default {
     };
   },
   watch: {
-    orgId() {
-      this.getData();
-    },
+    // orgId() {
+    //   this.getData();
+    // },
+    pandectData: {
+      immediate: true,
+      deep:true,
+      handler(newData) {
+        this.pandectData = newData
+          this.iniPieChart();
+      }
+    }
   },
   mounted() {
     this.$nextTick(() => {
@@ -179,7 +187,6 @@ export default {
       this.$refs.pieChart.clear();
       this.pieOption = pieOption();
       const {pandectData} = this;
-      console.log(pandectData)
       this.pieOption.title.text = pandectData.totalResidents;
       this.pieData = [
         {value: pandectData.permanentResiCount, name: "常住人口"},

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

@@ -52,7 +52,7 @@ export default {
     return {
       breadList: [
         {
-          type: "back",
+          path:'/dataBoard/renfang/index',
           meta: {
             title: "人房总览",
           },
@@ -145,6 +145,7 @@ export default {
       ],
 
       displayedHouseId: "",
+      typeName:''
     };
   },
 
@@ -152,6 +153,7 @@ export default {
     this.org_id = getQueryPara("org_id");
     this.houseType = getQueryPara("type");
     const type_name = getQueryPara("type_name");
+    this.typeName =  getQueryPara("type_name");
     this.breadList[1].meta.title = type_name + "房屋列表";
     this.tableTitle = type_name + "房屋列表";
     this.pageNo = 1;
@@ -164,16 +166,20 @@ export default {
         .getElementsByClassName("g-bd")[0].scrollTop = 0;
     },
     handleClickBreadItem({ item }) {
-      if (item.type == "back") {
-        this.$router.back();
-      }
+      this.$router.push({
+        path: item.path,
+      });
     },
 
     handleSearch() {},
 
     showInfo(index) {
       let item = this.srcTableData[index];
-      this.displayedHouseId = item.houseId;
+      // this.displayedHouseId = item.houseId;
+      // this.$router.push(`/homeDetails/index?id=${item.neighborHoodId}&buildingId=${item.buildingId}&unitId=${item.unitNumKey}`)
+      console.log(item);
+      this.$router.push(`/dataBoard/overview/familyPortrait/?name=${item.neighborHoodName}-${item.houseName}&buId=${item.buildingId}&type=renfang&orgId=${this.org_id}&type_name=${this.typeName}&name2=${ this.tableTitle }`)
+      
     },
 
     handlePageNoChange(pageNo) {

src/views/dataBoard/renfang/index.vue

@@ -494,8 +494,9 @@ export default {
       await this.getMapData();
       this.getResiCategoryData();
       this.getPerInfo();
-      this.getResiCategoryForecastData();
       this.getPandectData()
+
+      await this.getResiCategoryForecastData();
       this.loading = true;
     },
     //加载组织数据
@@ -567,13 +568,13 @@ export default {
     },
 
     clickAgencyItem(item) {
-      console.log(item)
+      console.log(item);
       if (item.level === 'neighborHood') {
         this.$router.push('/homeDetails/index?id='+item.id)
       } else {
         this.toBread({
           orgId: item.id,
-          orgLevel: item.level,
+          orgLevel: item.agencyLevel,
           meta: {title: item.name},
         });
       }
@@ -710,9 +711,11 @@ export default {
 
     //居民分类分析数据
     async getResiCategoryData() {
+      const {agencyId} = this.$store.state.user;
+      console.log(agencyId);
       const url = "/actual/base/resiCategory/categoryCountList";
       let params = {
-        agencyId: this.orgId,
+        agencyId: agencyId,
         orgId: this.orgId,
         level: this.orgLevel,
         // id: this.orgId,
@@ -739,10 +742,11 @@ export default {
 
     //居民分类预测数据
     async getResiCategoryForecastData() {
+      const {agencyId} = this.$store.state.user;
       const url = "/actual/base/resiCategory/intelligentPredictioncategoryCountList";
       let params = {
-        agencyId: this.orgId,
-        orgId: this.orgId,
+        agencyId:agencyId,
+        orgId:this.orgId,
         level: this.orgLevel,
       };
       const {data, code, msg} = await requestGet(url, params);
@@ -780,7 +784,7 @@ export default {
       if (code === 0) {
         this.orgData = data;
         this.orgId = this.orgId;
-        this.orgLevel = this.orgData.level;
+        // this.orgLevel = this.orgData.level;
       } else {
         this.$message.error(msg);
       }

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

@@ -50,15 +50,15 @@ export default {
     return {
       breadList: [
         {
-          type: "back",
+          path: "/dataBoard/renfang/index",
           meta: {
             title: "人房总览",
-          },
+          }
         },
         {
           meta: {
             title: "居民列表",
-          },
+          }
         },
       ],
 
@@ -144,9 +144,9 @@ export default {
 
   methods: {
     handleClickBreadItem ({ item }) {
-      if (item.type == "back") {
-        this.$router.back();
-      }
+      this.$router.push({
+        path: item.path,
+      });
     },
 
     handleSearch () { },
@@ -157,6 +157,7 @@ export default {
         path: "/dataBoard/overview/resident",
         query: {
           user_id: item.resiId,
+          type:'renfang'
         },
       });
     },

src/views/dataBoard/renfang/visualizing/components/laonianren.vue

@@ -27,6 +27,8 @@
 import dataTitle from "@/views/dataBoard/renfang/visualizing/components/dataTitle.vue";
 import * as echarts from "echarts";
 import {color, legend,title,series} from './pie_config.js'
+import {  requestPost } from '@/js/dai/request';
+
 function dataFormatter(arr) {
   return arr.map((item) => {
     return {
@@ -64,6 +66,8 @@ export default {
   activated() {},
   methods: {
     getData() {
+      const { user } = this.$store.state
+      console.log(user);
       this.$http
         .get("/actual/base/peopleRoomOverview/oldPeopleAgePie")
         .then(({ data: res }) => {
@@ -85,15 +89,22 @@ export default {
         })
         .catch(() => {});
         this.$http
-        .get("/actual/base/peopleRoomOverview/findPeoplePie/OLD_PEOPLE_FLAG")
+        .post(`/actual/base/peopleRoomOverview/findPeoplePie`,{  agencyId:user.agencyId,level:user.level,category:'OLD_PEOPLE_FLAG'})
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
           }
+          console.log(res.data,'kankan');
           this.lnrService = dataFormatter(res.data);
           this.initLnrServiceCharts();
         })
         .catch(() => {});
+        let url = '/actual/base/peopleRoomOverview/findPeoplePie'
+        let params = {
+          agencyId:user.agencyId,
+          level:user.level,
+          category:'OLD_PEOPLE_FLAG'
+        }
     },
     initLeftCharts() {
       let div = document.getElementById("lnrLeftChart");

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

@@ -185,6 +185,8 @@ export default {
   },
 
   activated() {
+    this.queryParams.mobile = ''
+    this.queryParams.name = ''
     if(this.$route.query.type == 'shuji'){
         this.breadcrumbList = [
         {

src/views/modules/base/organization/organization.vue

@@ -2699,6 +2699,8 @@ export default {
         this.modifyGridFrom.manageDistrict = data.manageDistrict;
         this.modifyGridFrom.griId = data.grid;
         this.modifyGridFrom.gridSort = data.gridSort;
+        this.latitude = data.latitude;
+        this.longitude = data.longitude;
       } else {
         this.$message.error(msg);
       }
@@ -2770,6 +2772,8 @@ export default {
         code: this.modifyGridFrom.code,
         gridType: this.modifyGridFrom.gridType,
         sort: this.modifyGridFrom.gridSort,
+        latitude:this.latitude,
+        longitude:this.longitude
       };
 
       const { data, code, msg } = await requestPost(url, params);

src/views/modules/communityService/fuwuzhaoren/addForm.vue

@@ -208,7 +208,7 @@
           >
           </el-input>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           label="直接反馈"
           prop="remark"
           label-width="150px"
@@ -220,7 +220,7 @@
             v-model="showFeedback"
             @change="handleChangeFeedback"
           ></el-checkbox>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div v-show="formType === 'feedback' || showFeedback">
         <!-- <h3 class="d-h3">反馈内容</h3> -->

src/views/modules/communityService/fuwuzhaoren/detailForm.vue

@@ -54,7 +54,7 @@
               <span>{{ formData.remark || "--" }}</span>
             </div>
 
-            <div v-show="formData.serviceStatus === 'completed'">
+            <div  v-show="false">
               <h3 class="d-h3">反馈内容</h3>
 
               <div class="info-prop">

src/views/modules/communityService/fuwuzhaoren/index.vue

@@ -244,11 +244,11 @@
                          size="small"
                          >编辑</el-button>
                          <!-- 临时去掉人员名单与反馈 -->
-              <el-button v-if="scope.row.serviceStatus==='in_service'"
+              <!-- <el-button v-if="scope.row.serviceStatus==='in_service'"
                          @click="handleFeedback(scope.row)"
                          type="text"
                          size="small"
-                         >反馈</el-button>
+                         >反馈</el-button> -->
               <!-- <el-button v-if="scope.row.policyId"
                          @click="handlePersonList(scope.row)"
                          type="text"

src/views/modules/communityService/gangweizhaoren/addForm.vue

@@ -224,7 +224,7 @@
           >
           </el-input>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           label="直接反馈"
           prop="remark"
           label-width="150px"
@@ -236,7 +236,7 @@
             v-model="showFeedback"
             @change="handleChangeFeedback"
           ></el-checkbox>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div v-show="formType === 'feedback' || showFeedback">
         <!-- <h3 class="d-h3">反馈内容</h3> -->

src/views/modules/communityService/gangweizhaoren/detailForm.vue

@@ -54,7 +54,7 @@
               <span>{{ formData.remark || "--" }}</span>
             </div>
 
-            <div v-show="formData.serviceStatus === 'completed'">
+            <div  v-show="false">
               <h3 class="d-h3">反馈内容</h3>
 
               <div class="info-prop">

src/views/modules/communityService/gangweizhaoren/index.vue

@@ -244,11 +244,11 @@
                          size="small"
                          >编辑</el-button>
                          <!-- 临时去掉人员名单与反馈 -->
-              <el-button v-if="scope.row.serviceStatus==='in_service'"
+              <!-- <el-button v-if="scope.row.serviceStatus==='in_service'"
                          @click="handleFeedback(scope.row)"
                          type="text"
                          size="small"
-                         >反馈</el-button>
+                         >反馈</el-button> -->
               <!-- <el-button v-if="scope.row.policyId"
                          @click="handlePersonList(scope.row)"
                          type="text"

src/views/modules/communityService/jinengzhaoren/addForm.vue

@@ -224,7 +224,7 @@
           >
           </el-input>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           label="直接反馈"
           prop="remark"
           label-width="150px"
@@ -236,7 +236,7 @@
             v-model="showFeedback"
             @change="handleChangeFeedback"
           ></el-checkbox>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div v-show="formType === 'feedback' || showFeedback">
         <!-- <h3 class="d-h3">反馈内容</h3> -->

src/views/modules/communityService/jinengzhaoren/detailForm.vue

@@ -54,7 +54,7 @@
               <span>{{ formData.remark || "--" }}</span>
             </div>
 
-            <div v-show="formData.serviceStatus === 'completed'">
+            <div  v-show="false">
               <h3 class="d-h3">反馈内容</h3>
 
               <div class="info-prop">

src/views/modules/communityService/jinengzhaoren/index.vue

@@ -244,11 +244,11 @@
                          size="small"
                          >编辑</el-button>
                          <!-- 临时去掉人员名单与反馈 -->
-              <el-button v-if="scope.row.serviceStatus==='in_service'"
+              <!-- <el-button v-if="scope.row.serviceStatus==='in_service'"
                          @click="handleFeedback(scope.row)"
                          type="text"
                          size="small"
-                         >反馈</el-button>
+                         >反馈</el-button> -->
               <!-- <el-button v-if="scope.row.policyId"
                          @click="handlePersonList(scope.row)"
                          type="text"

src/views/modules/communityService/wennuanzhaoren/addForm.vue

@@ -224,7 +224,7 @@
           >
           </el-input>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           label="直接反馈"
           prop="remark"
           label-width="150px"
@@ -236,7 +236,7 @@
             v-model="showFeedback"
             @change="handleChangeFeedback"
           ></el-checkbox>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div v-show="formType === 'feedback' || showFeedback">
         <!-- <h3 class="d-h3">反馈内容</h3> -->

src/views/modules/communityService/wennuanzhaoren/detailForm.vue

@@ -54,7 +54,7 @@
               <span>{{ formData.remark || "--" }}</span>
             </div>
 
-            <div v-show="formData.serviceStatus === 'completed'">
+            <div v-show="false">
               <h3 class="d-h3">反馈内容</h3>
 
               <div class="info-prop">

src/views/modules/communityService/wennuanzhaoren/index.vue

@@ -244,11 +244,11 @@
                          size="small"
                          >编辑</el-button>
                          <!-- 临时去掉人员名单与反馈 -->
-              <el-button v-if="scope.row.serviceStatus==='in_service'"
+              <!-- <el-button v-if="scope.row.serviceStatus==='in_service'"
                          @click="handleFeedback(scope.row)"
                          type="text"
                          size="small"
-                         >反馈</el-button>
+                         >反馈</el-button> -->
               <!-- <el-button v-if="scope.row.policyId"
                          @click="handlePersonList(scope.row)"
                          type="text"