Merge branch 'dataBoard' into dev

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

@@ -104,7 +104,7 @@
 
             <div class="items">
               <div class="label">所在位置：</div>
-              <div class="value">{{ detail.houseInfo.homeName }}</div>
+              <div class="value">{{ detail.houseInfo?detail.houseInfo.homeName: '' }}</div>
             </div>
             <div class="items">
               <div class="label">兴趣爱好：</div>

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

@@ -224,7 +224,7 @@ export default {
               this.peopleType === '4' ? 3 :
                   this.peopleType === 'staffGrid' ? 4 :
                       this.peopleType === 'publicWelfareNum' ? 5 : ''
-      this.$refs.ResourceInfo.open(type === 3 ? data.agencyId : data.id, type, data)
+      this.$refs.ResourceInfo.open(type === 3 ? data.orgId : data.id, type, data)
     },
     /*    handleViews() {
           this.$refs.ResourceInfo.open()

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

@@ -169,10 +169,10 @@ export default {
             orgLevel
         )
         .then(({ data: { data } }) => {
-          this.categoryList = data.categoryList;
-          this.houseList = data.houseList;
-          this.notSatisfactionList = data.notSatisfactionList;
-          this.riskList = data.riskList;
+          this.categoryList = data?data.categoryList:[];
+          this.houseList = data?data.houseList:[];
+          this.notSatisfactionList = data?data.notSatisfactionList:[];
+          this.riskList = data?data.riskList:[];
         });
     },
   },

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

@@ -98,7 +98,7 @@ export default {
       }
       return res;
     },
-    getData({ orgId, orgLevel }) {
+    getData({orgId, orgLevel}) {
       clearInterval(timer);
       this.$http
           .get(
@@ -107,7 +107,8 @@ export default {
               "&level=" +
               orgLevel
           )
-        .then(({ data: { data } }) => {
+          .then(({data: {data}}) => {
+            if (data) {
               data.forEach((item) => {
                 if (item.type === "house") {
                   this.house = item;
@@ -116,9 +117,10 @@ export default {
                   this.resident = item;
                 }
               });
+            }
           });
       timer = setInterval(() => {
-        this.getData({ orgId, level });
+        this.getData({orgId, orgLevel});
       }, 1000 * 60);
     },
   },
@@ -127,6 +129,6 @@ export default {
 
 <style
     lang="scss"
-  src="@/assets/scss/dataBoard/overview/index.scss"
     scoped
+    src="@/assets/scss/dataBoard/overview/index.scss"
 ></style>

src/views/dataBoard/overview/index.vue

@@ -25,7 +25,6 @@
             <img src="~@/assets/images/shuju/overview/go-back.png"/>
           </div>
           <grid-map
-              v-if="showMap"
               ref="map"
               :level="currentLevel"
               :peopleType="peopleType"
@@ -227,7 +226,7 @@ export default {
 
   beforeRouteLeave(to, from, next) {
     // 离开当前路由时，重置 showMap 为 false，表示要隐藏地图
-    this.showMap = false;
+    // this.showMap = false;
     console.log(this.showMap);
     next();
   },
@@ -420,9 +419,9 @@ export default {
         console.log(this.currentLevelData, 'this.currentLevelData 33210')
         this.peopleType = this.currentLevel === "grid" ? "unit" : "staffAgency";
         this.$refs.map.removeResourcesPoint();
-        // console.log(level,'level',orgId ,level === 'agency ' || level === 'community' || level === 'grid')
-        if (level === 'agency' || level === 'community' || level === 'grid') {
-          this.setResourcesPoint({agencyId: orgId})
+        console.log(this.currentLevel,'level',orgId ,this.currentLevel === 'agency' || this.currentLevel === 'community' || this.currentLevel === 'grid')
+        if (this.currentLevel === 'community' || this.currentLevel === 'grid') {
+          this.setResourcesPoint({agencyId: this.orgId})
         }
         this.getMapCount()
       });

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

@@ -179,6 +179,7 @@ export default {
       this.$refs.pieChart.clear();
       this.pieOption = pieOption();
       const {pandectData} = this;
+      console.log(pandectData)
       this.pieData = [
         {value: pandectData.permanentResiCount, name: "常住人口"},
         {value: pandectData.floatingResiCount, name: "流动人口"},

src/views/dataBoard/renfang/index.vue

@@ -11,14 +11,13 @@
           <Title text="房屋概览"/>
           <fwgl ref="fwgl" :orgId="orgId"></fwgl>
         </div>
-
         <div class="bgImg">
           <Title text="居民概览"/>
           <jmgl ref="jmgl" :orgId="orgId"></jmgl>
         </div>
         <div class="bgImg">
           <Title text="图谱画像"/>
-          <jdtphx :id="orgId"  ref="jmgl" :current-level-data="{orgId:orgId, level:orgLevel}"/>
+          <jdtphx :id="orgId" :current-level-data="{orgId:orgId, orgLevel:orgLevel}"/>
         </div>
       </div>
 
@@ -341,7 +340,7 @@
       <div class="g-right">
         <div class="bgImg">
           <Title text="信息采集统计"></Title>
-          <rfsjtj :currentLevelData="{orgId:orgId, level:orgLevel}"/>
+          <rfsjtj :currentLevelData="{orgId:orgId, orgLevel:orgLevel}"/>
         </div>
         <div class="bgImg">
           <Title text="人口预警"></Title>

src/views/dataBoard/satisfactionEval/index.vue

@@ -2,52 +2,56 @@
   <div class="satisfaction-eval">
     <el-row :gutter="20">
       <el-col :span="8" class="bgImg">
-        <Title text="12345数据分析" />
+        <Title text="12345数据分析"/>
         <eventAnalysis/>
       </el-col>
-      <el-col :span="8" >
+      <el-col :span="8">
         <!-- <EventSituation /> -->
         <div class=" bgImg">
           <Title text="不满意事项类型分析">
-            <div class="more" @click="goToPage(`/dataBoard/satisfactionEval/dissatisfied/${index}/${type}/${time}`)">查看详细 <i class="el-icon-arrow-right"></i></div>
+            <div class="more"
+            @click="goToPage(`/dataBoard/satisfactionEval/dissatisfied/${index}/${type}/${time}`)">查看详细 <i
+            class="el-icon-arrow-right"></i></div>
           </Title>
-          <TypesOfDissatisfaction @timeChange="timeChange" />
+          <TypesOfDissatisfaction @timeChange="timeChange"/>
         </div>
         <div class="bgImg">
-          <Title text="不满意事项及满意度自查走势" />
-          <SelfTrend />
+          <Title text="不满意事项及满意度自查走势"/>
+          <SelfTrend/>
         </div>
         <div class="bgImg">
-          <Title text="不满意人数统计及自查得分" >
+          <Title text="不满意人数统计及自查得分">
             <el-date-picker
             size="small"
             popper-class="date-current-weiyi"
             :append-to-body="false"
-            v-model="scoreMonth" type="month"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            v-model="scoreMonth"
+            type="month"
+            value-format="yyyy-MM-dd"
             value="yyyy-MM"
             placeholder="按月度"
             style="width: 118px"
+            :picker-options= "pickerOptions"
             />
           </Title>
           <SelfInspectionScore :date="scoreMonth"/>
-<!--          <Title text="下级组织不满意事项统计" />
+          <!--          <Title text="下级组织不满意事项统计" />
                     <EventStatistics :date="typeDate" />
                   --></div>
       </el-col>
       <el-col :span="8">
         <div class="bgImg">
-          <Title text="社区自查不满意原因" />
-          <DissatisfiedReason />
+          <Title text="社区自查不满意原因"/>
+          <DissatisfiedReason/>
         </div>
         <div class="bgImg">
-          <Title text="不满意人员画像" />
-          <PersonnelPortrait />
+          <Title text="不满意人员画像"/>
+          <PersonnelPortrait/>
         </div>
 
         <div class="bgImg">
-          <Title text="潜在不满意人数" />
-          <PotentialPeople :date="typeDate" />
+          <Title text="潜在不满意人数"/>
+          <PotentialPeople :date="typeDate"/>
         </div>
       </el-col>
     </el-row>
@@ -89,7 +93,14 @@ export default {
       index: 0,
       type: 0,
       time: 0,
-      scoreMonth: ""
+      scoreMonth: this.$moment().add(-1, 'month').startOf("month").format("YYYY-MM-DD"),
+      pickerOptions: {
+        disabledDate: (time) => {
+          let month = this.$moment().add(-1, 'month').startOf("month").format("YYYY-MM-DD")
+          // return time.getTime() > Date.now()
+          return time.getTime() > new Date(month).getTime();
+        }
+      }
     }
   },
   methods: {
@@ -102,38 +113,39 @@ export default {
   },
 };
 </script>
-<style lang="scss" src="@/assets/scss/dataBoard/overview/index.scss" scoped />
+<style lang="scss" scoped src="@/assets/scss/dataBoard/overview/index.scss"/>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 /deep/ .el-input__inner {
   //width: 90px !important;
   height: 24px !important;
-    background: #021c49 !important;
+  color: #a0cdff;
   border: 1px solid #125aaa !important;
   border-radius: 12px !important;
-    color: #a0cdff;
-  }
+  background: #021c49 !important;
+}
 
-  /deep/ .el-input__icon {
+/deep/ .el-input__icon {
   line-height: 24px !important;
   color: #a0cdff;
-  }
+}
 
 .more {
   font-size: 14px;
   font-weight: 400;
-  color: #a0cdff;
   cursor: pointer;
+  color: #a0cdff;
 }
-.bgImg{
+
+.bgImg {
+  margin-top: 5px;
   background: url('@/assets/images/shuju/overview/box-bg.png') no-repeat;
   background-size: 100% 100%;
-	margin-top: 5px;
 }
 
 ::v-deep .date-current-weiyi {
-  background: rgba(3, 19, 51, 0.9);
   border-color: #006cff;
+  background: rgba(3, 19, 51, 0.9);
   box-shadow: inset 0px 0px 16px 0px rgba(0, 145, 255, 1);
 
   .el-date-picker__header-label {
@@ -164,5 +176,9 @@ export default {
   .el-date-picker__header--bordered {
     border-bottom: solid 1px #006cff;
   }
+  .el-month-table td.disabled .cell {
+    background: none;
+    opacity: .5;
+  }
 }
 </style>

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

@@ -1,33 +1,33 @@
 <template>
   <div class="table">
     <el-table :data="data" height="290px">
-      <el-table-column label="社区" prop="number" width="100"></el-table-column>
-      <el-table-column label="" prop="column1" width="130">
+      <el-table-column label="社区" prop="agencyName" width="100"></el-table-column>
+      <el-table-column label="" prop="events" width="130">
         <template #header>
           <div>12345热线投诉</div>
           <div>人数</div>
         </template>
       </el-table-column>
-      <el-table-column label="" prop="column2" width="130">
+      <el-table-column label="" prop="province" width="130">
         <template #header>
           <div>上级满意度调查</div>
           <div>不满意人数</div>
         </template>
       </el-table-column>
-      <el-table-column label="" prop="column3" width="130">
+      <el-table-column label="" prop="inspection" width="130">
         <template #header>
           <div>社区自查不满意</div>
           <div>人数</div>
         </template>
       </el-table-column>
-      <el-table-column label="社区自查得分" prop="column3" width="120"></el-table-column>
+      <el-table-column label="社区自查得分" prop="score" width="120"></el-table-column>
     </el-table>
   </div>
 </template>
 
 <script>
 export default {
-  name: "index",
+  name: "SelfInspectionScore",
   data() {
     return {
       data: []
@@ -55,6 +55,13 @@ export default {
   methods: {
     getList() {
       console.log(this.date)
+      let params = {
+        time: this.date,
+        agencyId: this.$store.state.chooseArea.chooseName.orgId
+      }
+      this.$http.get('/governance/satisfaction/communitySelfInsp/satisfactionScore?'+this.$paramsFormat(params), params).then(res => {
+        this.data = res.data.data
+      })
     }
   }
 }