Merge branch 'dataBoard_jw_zlb' of http://120.46.222.128:10021/elink-star/epmet-work-pc into dataBoard_jw_zlb

2 years ago · ac78a3afad
19 changed files with 116 additions and 23 deletions
--- a/src/App.vue
+++ b/src/App.vue
@ -241,7 +241,7 @@ export default {
 .selectPopClass {
  border: none !important;
  background: linear-gradient(180deg, #05326e 0%, #032a5d 100%) !important;
-  .el-autocomplete-suggestion li{
+  &.el-autocomplete-suggestion li{
    color: #fff!important;
    &:hover {
      background: rgba(#409eff, .5)!important;
--- a/src/assets/scss/dataBoard/overview/index.scss
+++ b/src/assets/scss/dataBoard/overview/index.scss
@ -84,7 +84,7 @@
  .f-font34 {
 	font-size: 34px !important;
 	font-style: italic;
-	font-weight: 500;
+	font-weight: bold;
 	font-family: DIN Alternate;
  }
  .f-yellow{
--- a/src/views/dataBoard/overview/components/MapDialog/CommunityList.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/CommunityList.vue
@ -121,11 +121,13 @@ export default {
  font-size: 14px;
  margin-left: 10px;
  color: #9A69EC;
+  cursor: pointer;
 }

 .view {
  font-size: 14px;
  margin-left: 10px;
  color: #007FF1;
+  cursor: pointer;
 }
 </style>
--- a/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue
@ -252,11 +252,13 @@ export default {
  font-size: 14px;
  margin-left: 10px;
  color: #9A69EC;
+  cursor: pointer;
 }

 .view {
  font-size: 14px;
  margin-left: 10px;
  color: #007FF1;
+  cursor: pointer;
 }
 </style>
--- a/src/views/dataBoard/overview/components/MapDialog/List12345.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/List12345.vue
@ -141,11 +141,13 @@ export default {
  font-size: 14px;
  margin-left: 10px;
  color: #9A69EC;
+  cursor: pointer;
 }

 .view {
  font-size: 14px;
  margin-left: 10px;
  color: #007FF1;
+  cursor: pointer;
 }
 </style>
--- a/src/views/dataBoard/overview/components/MapDialog/Njjwtqk.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/Njjwtqk.vue
@ -129,11 +129,13 @@ export default {
  font-size: 14px;
  margin-left: 10px;
  color: #9A69EC;
+  cursor: pointer;
 }

 .view {
  font-size: 14px;
  margin-left: 10px;
  color: #007FF1;
+  cursor: pointer;
 }
 </style>
--- a/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue
@ -251,11 +251,13 @@ export default {
  font-size: 14px;
  margin-left: 10px;
  color: #9A69EC;
+  cursor: pointer;
 }

 .view {
  font-size: 14px;
  margin-left: 10px;
  color: #007FF1;
+  cursor: pointer;
 }
 </style>
--- a/src/views/dataBoard/overview/components/MapDialog/SatisfactionList.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/SatisfactionList.vue
@ -141,11 +141,13 @@ export default {
  font-size: 14px;
  margin-left: 10px;
  color: #9A69EC;
+  cursor: pointer;
 }

 .view {
  font-size: 14px;
  margin-left: 10px;
  color: #007FF1;
+  cursor: pointer;
 }
 </style>
--- a/src/views/dataBoard/overview/components/MapDialog/index.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/index.vue
@ -277,12 +277,14 @@ export default {
  font-size: 14px;
  margin-left: 10px;
  color: #9A69EC;
+  cursor: pointer;
 }

 .view {
  font-size: 14px;
  margin-left: 10px;
  color: #007FF1;
+  cursor: pointer;
 }

 .eventDetails {
--- a/src/views/dataBoard/overview/components/MapResourceInfo.vue
+++ b/src/views/dataBoard/overview/components/MapResourceInfo.vue
@ -38,7 +38,7 @@
            </div>
            <div class="items">
              <div class="label">联系电话：</div>
-              <div class="value">{{ detail.contactMobile }}</div>
+              <div class="value">{{ $sensitive( detail.contactMobile, 3, 7) }}</div>
              <CallPhone icon="el-icon-phone"/>
            </div>
            <div class="items">
--- a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
+++ b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
@ -382,11 +382,13 @@ export default {
  font-size: 14px;
  margin-left: 10px;
  color: #9A69EC;
+  cursor: pointer;
 }

 .view {
  font-size: 14px;
  margin-left: 10px;
  color: #007FF1;
+  cursor: pointer;
 }
 </style>
--- a/src/views/dataBoard/overview/components/map-top.vue
+++ b/src/views/dataBoard/overview/components/map-top.vue
@ -252,4 +252,6 @@ export default {
 .m-per {
  margin-right: 77px;
 }
+
+
 </style>
--- a/src/views/dataBoard/overview/components/wtqd.vue
+++ b/src/views/dataBoard/overview/components/wtqd.vue
@ -316,7 +316,7 @@ export default {
 }

 .f-hflex {
-  width: 83px;
+  width: 100px;
 }

 .f-flex {
@ -325,6 +325,9 @@ export default {

 .f-darkGray {
  margin-top: 15px;
+  display: flex;
+  white-space: nowrap;
+  align-items: flex-end;
 }

 .no-data {
--- a/src/views/dataBoard/overview/dissatisfiedProblemNumber/12345Hotline.vue
+++ b/src/views/dataBoard/overview/dissatisfiedProblemNumber/12345Hotline.vue
@ -22,7 +22,7 @@
        </el-table-column>
        <el-table-column label="状态" prop="operationTypeName"/>
        <el-table-column label="操作" min-width="150px">
-          <template slot-scope="row">
+          <template slot-scope="{row}">
            <CallPhone text="拨打电话"/>
            <span class="handle" @click="handleDispatch(row)">处理</span>
            <span class="view" @click="handleView(row)">查看</span>
@ -91,9 +91,9 @@ export default {
      this.queryParams.pageNo = 1;
      this.getList();
    },
-    handleDispatch({id}) {
+    handleDispatch({icEventId}) {
      this.$http
-          .post("/governance/icEvent/detail", {icEventId: id})
+          .post("/governance/icEvent/detail", {icEventId})
          .then((res) => {
            const {code, data, msg} = res.data;
            if (code === 0) {
@ -130,14 +130,9 @@ export default {
      }

    },
-    handleView({id}) {
-      console.log("row:"+id);
+    handleView({icEventId}) {
      this.showDialog = true;
-      this.rowId = id;
-    },
-    handleHandle({id}) {
-      this.showDialog = true;
-      this.rowId = id;
+      this.rowId = icEventId;
    },
    close() {
      this.showDialog = false;
@ -157,11 +152,13 @@ export default {
  font-size: 14px;
  margin-left: 10px;
  color: #9A69EC;
+  cursor: pointer;
 }

 .view {
  font-size: 14px;
  margin-left: 10px;
  color: #007FF1;
+  cursor: pointer;
 }
 </style>
--- a/src/views/dataBoard/overview/dissatisfiedProblemNumber/provinceSatisfaction.vue
+++ b/src/views/dataBoard/overview/dissatisfiedProblemNumber/provinceSatisfaction.vue
@ -166,11 +166,13 @@ export default {
  font-size: 14px;
  margin-left: 10px;
  color: #9A69EC;
+  cursor: pointer;
 }

 .view {
  font-size: 14px;
  margin-left: 10px;
  color: #007FF1;
+  cursor: pointer;
 }
 </style>
--- a/src/views/dataBoard/overview/dissatisfiedProblemNumber/selfInspect.vue
+++ b/src/views/dataBoard/overview/dissatisfiedProblemNumber/selfInspect.vue
@ -122,11 +122,13 @@ export default {
  font-size: 14px;
  margin-left: 10px;
  color: #9A69EC;
+  cursor: pointer;
 }

 .view {
  font-size: 14px;
  margin-left: 10px;
  color: #007FF1;
+  cursor: pointer;
 }
 </style>
--- a/src/views/dataBoard/satisfactionEval/dissatisfieReason/index.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfieReason/index.vue
@ -35,14 +35,14 @@
                element-loading-spinner="el-icon-loading" element-loading-text="加载中...">
        <el-table-column label="序号" type="index" width="80"/>

-        <el-table-column label="填写时间" prop="key" width="118"/>
-        <el-table-column label="所属组织" prop="gridName" width="118"/>
+        <el-table-column label="填写时间" prop="periodStart" width="130"/>
+        <el-table-column label="所属组织" prop="agencyName" width="118"/>

-        <el-table-column label="姓名" prop="restName"></el-table-column>
+        <el-table-column label="姓名" prop="reporterName"></el-table-column>

-        <el-table-column label="联系电话" prop="mobile">
+        <el-table-column label="联系电话" prop="reporterMobile">
          <template slot-scope="scope">
-            {{ $sensitive(scope.row.mobile, 3, 7) }}
+            {{ $sensitive(scope.row.reporterMobile, 3, 7) }}
          </template>
        </el-table-column>
        <el-table-column :formatter="(row) => row.evaCulturalFacility === 'veryGood' ? '满意' : '不满意'" label="文化设施" prop="evaCulturalFacility"
--- a/src/views/dataBoard/satisfactionEval/index.vue
+++ b/src/views/dataBoard/satisfactionEval/index.vue
@ -18,8 +18,19 @@
          <SelfTrend />
        </div>
        <div class="bgImg">
-          <Title text="不满意人数统计及自查得分" />
-          <SelfInspectionScore/>
+          <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"
+            value="yyyy-MM"
+            placeholder="按月度"
+            style="width: 118px"
+            />
+          </Title>
+          <SelfInspectionScore :date="scoreMonth"/>
 <!--          <Title text="下级组织不满意事项统计" />
          <EventStatistics :date="typeDate" />
        --></div>
@ -78,7 +89,8 @@ export default {
      index: 0,
      type: 0,
      time: 0,
-    };
+      scoreMonth: ""
+    }
  },
  methods: {
    goToPage(url) {
@ -94,7 +106,7 @@ export default {

 <style scoped lang="scss">
 /deep/ .el-input__inner {
-    width: 90px !important;
+    //width: 90px !important;
    height: 24px !important;
    background: #021c49 !important;
    border: 1px solid #125aaa !important;
@ -119,4 +131,38 @@ export default {
 	margin-top: 5px;
 }

+::v-deep .date-current-weiyi {
+  background: rgba(3, 19, 51, 0.9);
+  border-color: #006cff;
+  box-shadow: inset 0px 0px 16px 0px rgba(0, 145, 255, 1);
+
+  .el-date-picker__header-label {
+    color: #ffffff;
+  }
+
+  .el-picker-panel__icon-btn {
+    color: #ffffff;
+  }
+
+  .el-month-table {
+    td {
+      .cell {
+        color: #ffffff;
+      }
+    }
+  }
+
+  .el-month-table td.current:not(.disabled) .cell {
+    color: #fff;
+    background-color: #409eff;
+  }
+
+  .el-month-table td.today:not(.disabled) .cell {
+    color: #0056d6;
+  }
+
+  .el-date-picker__header--bordered {
+    border-bottom: solid 1px #006cff;
+  }
+}
 </style>
--- a/src/views/dataBoard/satisfactionEval/modules/SelfInspectionScore/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/SelfInspectionScore/index.vue
@ -32,6 +32,30 @@ export default {
    return {
      data: []
    }
+  },
+  props: {
+    date: {
+      type: String,
+      default: '',
+    },
+  },
+  watch: {
+    "$store.state.chooseArea.chooseName"(val) {
+      if (val.orgId) {
+        this.getList();
+      }
+    },
+    date() {
+      this.getList();
+    },
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      console.log(this.date)
+    }
  }
 }
 </script>
@ -41,4 +65,5 @@ export default {
 .table {
  padding: 10px;
 }
+
 </style>