bug fixed

src/assets/css/element_ui.css

@@ -7,6 +7,7 @@
   margin-bottom: 0px;
 }
 
+
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item:hover {
   background-color: #0E7DFD;
@@ -66,12 +67,12 @@
   cursor: pointer;
   padding-right: 35px;
   width: 100%;
-  height: 25px;
+  height: 30px;
   font-size: 13px;
   padding: 0px 6px;
-  background-color: #041841;
-  color: #92CCFA;
-  border: 1px solid #19446E;
+  /*background-color: #041841;*/
+  /*color: #92CCFA;*/
+  /*border: 1px solid #19446E;*/
 }
 
 .el-select .el-input__inner:focus {
@@ -91,17 +92,22 @@
   font-weight: 700;
 }
 
+.el-input__suffix .el-input__suffix-inner {
+  display: flex;
+  align-items: center;
+}
+
 .el-select:hover .el-input__inner {
   border-color: #19446E;
 }
 
-.el-select-dropdown__item {
-  color: #92CCFA;
-}
+/*.el-select-dropdown__item {*/
+/*  color: #92CCFA;*/
+/*}*/
 
-.el-icon-arrow-up:before {
-  color: #92CCFA;
-}
+/*.el-icon-arrow-up:before {*/
+/*  color: #92CCFA;*/
+/*}*/
 
 .el-popper[x-placement^=bottom] .popper__arrow {
   display: none;

src/components/barChart.vue

@@ -196,7 +196,7 @@ export default {
 }
 </script>
 
-<style lang="less">
+<style lang="less"scoped>
   .chart {
     width: 100%;
     height: 100%;

src/components/emap.vue

@@ -197,7 +197,7 @@ export default {
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .chart-box {
   position: relative;
 }

src/components/lineChart.vue

@@ -208,7 +208,7 @@ export default {
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .chart {
   width: 100%;
   height: 100%;

src/components/pieChart.vue

@@ -152,7 +152,7 @@ export default {
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .chart {
   width: 100%;
   height: 100%;

src/components/radarChart.vue

@@ -85,7 +85,7 @@ export default {
 }
 </script>
 
-<style>
+<style lang="less" scoped>
 .chart {
   width: 100%;
   height: 100%;

src/components/vtableNew.vue

@@ -150,7 +150,7 @@ export default {
 }
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
   @keyframes tbodyauto {
     from {transform: translateY(0px);}
     to {transform: translateY(-100%);}

src/pages/index/components/heat_map.vue

@@ -177,18 +177,5 @@ export default {
     height: 90%;
     width: 100%;
   }
-  /deep/.map-tooltip {
-    font-size: 18px;
-    padding: 10px 20px;
-    background: url("../../../../static/img/u231.png");
-    background-size: 100% 100%;
-    .map-tooltip-name {
-      color: #00e4ff;
-    }
-    .map-tooltip-value {
-      color: white;
-      margin-left: 20px;
-    }
-  }
 }
 </style>

src/pages/index/components/hot_map.vue

@@ -22,7 +22,7 @@ export default {
           type: "continuous",
           left: "0%",
           bottom: "0%",
-          calculable: false,
+          calculable: true,
           textStyle: {
             color: "white",
           },
@@ -82,7 +82,7 @@ export default {
                 areaColor: "#4282de",
               },
               emphasis: {
-                areaColor: "#ff4800",
+                areaColor: "#002aff",
                 borderWidth: 0,
                 color: "green",
               },
@@ -98,11 +98,6 @@ export default {
       totalAll: '0',
     };
   },
-  watch: {
-    dqIndex: function (newV) {
-      this.queryDq(newV);
-    },
-  },
   methods: {
     setIntervalMap(chart) {
       this.timer = setInterval(() => {
@@ -139,9 +134,15 @@ export default {
         });
       }
     }
+    let mapMax = Math.max(...arr.map(item => item.value))
+    let mapMin = Math.min(...arr.map(item => item.value))
+    console.log(mapMin, '111')
+    console.log(mapMax, '222')
     let chart = echarts.init(document.getElementById("map"));
     echarts.registerMap("luohe", geoJson);
     this.option.series[0].data = arr;
+    this.option.visualMap.min = mapMin;
+    this.option.visualMap.max = mapMax;
     chart.setOption(this.option);
     this.dqIndex = -1;
     this.setIntervalMap(chart);

src/pages/index/components/operation_log.vue

@@ -0,0 +1,167 @@
+<template>
+  <div class="body-wrapper">
+    <el-form class="form-wrapper" :inline="true" :model="formInline">
+      <el-form-item label="审批人">
+        <el-input v-model="formInline.interfaceName" placeholder="审批人"></el-input>
+      </el-form-item>
+      <el-form-item label="活动区域">
+        <el-select v-model="formInline.region" placeholder="活动区域" class="cur-select">
+          <el-option label="区域一" value="shanghai"></el-option>
+          <el-option label="区域二" value="beijing"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="tableData" style="background: #2a2a2a;border-color: #333;">
+      <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        width="100">
+        <template slot-scope="scope">
+          <el-button v-if="scope.row && scope.row.applyType === '1'" @click="handleDetail(scope.row)" type="text" size="small">查看详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-pagination">
+      <el-pagination :background="false" layout="total, prev, pager, next" :total="total" @current-change="handlePageChange"
+                     :current-page.sync="pageNum" :page-size.sync="pageSize">
+      </el-pagination>
+    </div>
+    <el-dialog
+      title="详情"
+      :visible.sync="dialogVisible"
+      width="60%"
+      custom-class="audit-dialog">
+      <el-input type="textarea" disabled v-model="selRow.createTime"></el-input>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import api from "@/api/audit.js";
+
+export default {
+  components: {},
+  data() {
+    return {
+      columns: [
+        {
+          label: '日期',
+          key: 'resourceName'
+        },
+        {
+          label: '操作',
+          key: 'resourceType'
+        },
+        {
+          label: '用户',
+          key: 'userName'
+        },
+        {
+          label: '详情',
+          key: 'applyTypeText'
+        },
+        {
+          label: 'IP地址',
+          key: 'applyTypeText'
+        }
+      ],
+      tableData: [],
+      total: 0,
+      pageSize: 10,
+      pageNum: 1,
+      radio: '2',
+      dialogVisible: false,
+      selRow: {},
+      formInline: {
+        interfaceName: '',
+        region: ''
+      }
+    }
+  },
+  mounted() {
+    this.getTableData()
+  },
+  watch: {
+  },
+  methods: {
+    handlePageChange() {
+      this.getTableData()
+    },
+    handleDetail(row) {
+      this.selRow = row
+      this.dialogVisible = true
+    },
+    getTableData() {
+      const {pageNum, pageSize, searchWords} = this
+      api.applyList({pageNum, pageSize, interfaceName: this.formInline.interfaceName}).then(res => {
+        this.tableData = res.data.records
+        this.total = res.data.total
+      })
+    },
+    onSubmit() {
+      console.log('submit!');
+    }
+  }
+}
+</script>
+<style  lang="scss" scoped>
+.form-wrapper {
+  margin-bottom: 20px;
+  /deep/ .el-input__inner {
+  background: #2d3744;
+  border: none;
+  border-radius: 0;
+  }
+}
+/deep/.el-select {
+  height: 40px;
+  .el-input__inner {
+    height: 40px;
+  }
+
+  .el-input__prefix, .el-input__suffix {
+    height: 40px;
+  }
+
+  /* 下面设置右侧按钮居中 */
+  .el-input__suffix {
+    top: 0px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    align-content: flex-start;
+  }
+  /* 输入框加上上下边是 32px + 2px =34px */
+  .el-input__icon {
+    line-height: 0px;
+  }
+}
+.body-wrapper {
+  padding: 20px;
+  background: #0c0c0c;
+  .button-block{
+    text-align: right;
+    margin-bottom: 20px;
+  }
+  .table-pagination{
+    text-align: right;
+  }
+}
+.audit-dialog{
+  .mg-bt{
+    margin-bottom: 24px;
+  }
+  .label{
+    text-align: right;
+  }
+}
+/deep/ .el-textarea.is-disabled .el-textarea__inner {
+  background: #2a2a2a;
+  color: #fff;
+}
+</style>

src/pages/index/layouts/indexLayout.vue

@@ -66,6 +66,7 @@ export default {
         {name: '运营停车场主题', url: '/parking_operate'},
         {name: '区域停车主题', url: '/parking_area'},
         {name: '设备运营主题', url: '/service_operations'},
+        {name: '操作日志', url: '/operation_log'},
       ]
     }
   },

src/router/index.js

@@ -169,6 +169,11 @@ export default new Router({
           path: "/service_operations",
           component: () => import("../pages/index/components/service_operations.vue")
         },
+        {
+          name: "operation_log",
+          path: "/operation_log",
+          component: () => import("../pages/index/components/operation_log.vue")
+        },
       ]
     }
   ]