调整书记看板高度，替换共性需求接口

2 years ago · be9e8fd4c2
8 changed files with 55 additions and 36 deletions
--- a/src/assets/scss/dataBoard/overview/index.scss
+++ b/src/assets/scss/dataBoard/overview/index.scss
@ -219,8 +219,8 @@
 }

 .m-jdjs {
-	height: 548px;
-	padding: 0 16px;
+	//height: 548px;
+	padding: 0 16px 10px;

 	&-js {
 		margin: 20px 0;
@ -228,27 +228,27 @@
 		justify-content: space-between;

 		&-img {
-			width: 200px;
-			height: 140px;
+			width: 180px;
+			height: 110px;
 			background: #00ACF7;
 			border-radius: 6px;
 			overflow: hidden;

 			img {
-				width: 200px;
-				height: 140px;
+				width: 180px;
+				height: 110px;
 			}
 		}

 		&-txt {
-			width: 213px;
+			width: calc(100% - 180px);
 			font-size: 14px;
 			font-family: PingFang SC;
-			font-weight: bold;
-			color: #FFFFFF;
-			line-height: 24px;
 			margin-left: 16px;
-			// padding-top: 14px;
+			font-weight: 400;
+			color: #FFFFFF;
+			line-height: 22px;
+			text-indent: 2em;
 		}
 	}

--- a/src/views/dataBoard/overview/components/DemandCharts.vue
+++ b/src/views/dataBoard/overview/components/DemandCharts.vue
@ -163,7 +163,7 @@ export default {
  #DemandCharts {
    flex: calc(100% - 100px);
    width: calc(100% - 100px);
-    height: 150px;
+    height: 126px;
  }
 }
 </style>
--- a/src/views/dataBoard/overview/components/DemandCharts2.vue
+++ b/src/views/dataBoard/overview/components/DemandCharts2.vue
@ -163,7 +163,7 @@ export default {
  #DemandCharts2 {
    flex: calc(100% - 100px);
    width: calc(100% - 100px);
-    height: 150px;
+    height: 126px;
  }
 }
 </style>
--- a/src/views/dataBoard/overview/components/RequirementList.vue
+++ b/src/views/dataBoard/overview/components/RequirementList.vue
@ -16,7 +16,7 @@
    </div>
    <DemandSwiperList v-if="tabval2 === 1" :list="commonDemandList" @showDetail="showDetail2">
      <template slot-scope="{data}">
-        <span>{{ data.createdTime }}</span>
+        <span>{{ data.createdTime?$moment(data.createdTime).format('MM-DD'):'' }}</span>
        <span>{{ data.title }}</span>
      </template>
    </DemandSwiperList>
@ -82,8 +82,8 @@ export default {
    showDetail({demandRecId}) {
      this.$refs.ServiceDetails.open(demandRecId);
    },
-    showDetail2() {
-      this.$refs.Bmysxxq.open();
+    showDetail2({id}) {
+      this.$refs.Bmysxxq.open(id);
    },
    getUserDemandList() {
      this.$http.post('/governance/userdemand/pagelist', {status: "pending", pageSize: 20}).then(({data: {data}}) => {
@ -92,7 +92,10 @@ export default {
      })
    },
    getCommonDemandList() {
-      this.$http.get('/governance/commonDemand/list?assignFlag=0&pageSize=20').then(({data: {data}}) => {
+      this.$http.post('/governance/commonDemand/list',{
+        assignFlag:0,
+        pageSize: 20
+      }).then(({data: {data}}) => {
        this.commonDemandList = data ? data.list : []
      })
    },
--- a/src/views/dataBoard/overview/components/jdjs.vue
+++ b/src/views/dataBoard/overview/components/jdjs.vue
@ -16,7 +16,7 @@
        element-loading-text="加载中..."
        element-loading-spinner="el-icon-loading"
        element-loading-background="rgba(0,0,0,0.5)"
-        style="height: 170px"
+        style="height: 130px"
      />
    </div>
    <title-small text="不满意风险人员">
@ -184,11 +184,11 @@ export default {
          show: false,
          text: '',
          x: 'center',
-          top: '15px',
+          top: '18px',
          textStyle: {
            color: '#333333',
            fontWeight: 500,
-            fontSize: 18,
+            fontSize: 12,
          },
        },
        tooltip: {
@ -276,14 +276,16 @@ export default {
              textStyle: {
                fontSize: 12
              },
-              align: 'center'
+              align: 'right',
+              padding: [6, 5, 5, 5],
            },
            axisLabel: {
              show: true,
              color: '#A3B9DA',
              textStyle: {
                fontSize: 12
-              }
+              },
+
            },
            axisTick: {
              show: false
--- a/src/views/dataBoard/overview/components/wtqd.vue
+++ b/src/views/dataBoard/overview/components/wtqd.vue
@ -20,9 +20,10 @@
        </swiper-slide>
      </swiper>
    </div>
-    <div v-else v-loading="listLoading" class="no-data h200"
+    <div v-else v-loading="listLoading" class="no-data h150"
         element-loading-background="rgba(0, 21, 64, 0"
-         element-loading-spinner="el-icon-loading" element-loading-text="加载中">暂无数据
+         element-loading-spinner="el-icon-loading" element-loading-text="加载中">
+      <NoData size="40"/>
    </div>

    <title-small text="矛盾纠纷"/>
@ -44,9 +45,11 @@
        </swiper-slide>
      </swiper>
    </div>
-    <div v-else v-loading="listLoading" class="no-data h200" element-loading-background="rgba(0, 21, 64, 0"
+    <div v-else v-loading="listLoading" class="no-data h150" element-loading-background="rgba(0, 21, 64, 0"
         element-loading-spinner="el-icon-loading"
-         element-loading-text="加载中">暂无数据
+         element-loading-text="加载中">
+      <NoData size="40"/>
+
    </div>
    <title-small text="自身问题"/>
    <div v-if="zswt.length>0" class="t-list f-hflex">
@ -70,7 +73,9 @@
    </div>
    <div v-else v-loading="listLoading" class="no-data h150" element-loading-background="rgba(0, 21, 64, 0"
         element-loading-spinner="el-icon-loading"
-         element-loading-text="加载中">暂无数据
+         element-loading-text="加载中">
+      <NoData size="40"/>
+
    </div>
    <title-small text="超出服务范围"/>
    <div v-if="ccfwfw.length>0" class="t-list f-hflex">
@ -94,7 +99,9 @@
    </div>
    <div v-else v-loading="listLoading" class="no-data h150" element-loading-background="rgba(0, 21, 64, 0"
         element-loading-spinner="el-icon-loading"
-         element-loading-text="加载中">暂无数据
+         element-loading-text="加载中">
+      <NoData size="40"/>
+
    </div>
    <title-small text="不满意问题数"/>
    <div class="f-flex white f-mean">
@ -148,6 +155,7 @@ import "swiper/dist/css/swiper.css";
 import {swiper, swiperSlide} from "vue-awesome-swiper";
 import {requestPost} from "@/js/dai/request";
 import EventDetails from "@/views/dataBoard/overview/components/EventDetail.vue";
+import NoData from "@/views/dataBoard/cpts/NoData";

 export default {
  name: "wtqd",
@ -156,6 +164,7 @@ export default {
    swiper,
    swiperSlide,
    EventDetails,
+    NoData
  },
  props: {
    currentLevelData: {
@ -351,7 +360,7 @@ export default {

  .swiper-container {
    width: 100%;
-    height: 200px;
+    height: 150px;
  }

  .swiper-containers {
@ -401,7 +410,8 @@ export default {
 }

 .white {
-  height: 100px;
+  padding: 18px 0;
+  //height: 100px;
 }
 </style>
  
--- a/src/views/dataBoard/overview/index.vue
+++ b/src/views/dataBoard/overview/index.vue
@ -721,6 +721,6 @@ export default {
 }

 .m-map {
-  height: 1050px;
+  height: 970px;
 }
 </style>
--- a/src/views/dataBoard/satisfactionEval/modules/eventAnalysis/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/eventAnalysis/index.vue
@ -19,9 +19,9 @@
        <div>类型</div>
        <div>投诉次数</div>
      </div>
-      <div class="list-con">
-
+      <div class="list-con" >
        <div
+            v-if="list.length > 0"
            v-for="(item, index) in list"
            :key="index"
            :class="['item', 'f-flex']"
@ -32,6 +32,7 @@
          <div>{{ item.categoryName }}</div>
          <div>{{ item.amount }}</div>
        </div>
+        <NoData v-else size="80"/>
      </div>
    </div>

@ -59,11 +60,13 @@
            :key="index"
            class="item f-flex bto-border"
            @click="goTryDetail(item)"
+            v-if="list2.length > 0"
        >
          <div>{{ index - 0 + 1 }}</div>
          <div>{{ item.mobile }}</div>
          <div>{{ item.amount }}</div>
        </div>
+        <NoData v-else size="80"/>
      </div>
    </div>

@ -206,9 +209,10 @@ export default {
        "queryDateStart": this.startTime,
        "queryDateEnd": this.endTime
      }).then(({data: {data}}) => {
-        this.list = data.addressMobileEvents
-        this.list2 = data.mobileEvent
-        this.data = data.addressEvent
+        console.log(data)
+        this.list = data?data.addressMobileEvents: [] || []
+        this.list2 = data?data.mobileEvent: [] || []
+        this.data = data?data.addressEvent: [] || []
      })
    },