地区字典获取修改，网站名称修改，echart样式修改

官美宏
Commit f9490e6d ... f9490e6d392a9c8e98f1976e3ca7fdb2d8b9ca21 authored 2021-09-24 10:06:52 +0800 by 官美宏
Showing 5 changed files with 23 additions and 24 deletions
src/layout/components/Sidebar/Logo.vue
src/settings.js
src/views/aiqiyi/index.vue
src/views/dashboard/BarChart.vue
src/views/login.vue
--- a/src/layout/components/Sidebar/Logo.vue
View file @f9490e6
+++ b/src/layout/components/Sidebar/Logo.vue
View file @f9490e6
@@ -25,8 +25,8 @@ export default {
  },
  data() {
    return {
-      title: '基础框架',
+      title: '爱奇艺小卡',
-      stitle: '基础框架',
+      stitle: '爱奇艺小卡',
      logo: Logo
    }
  }
--- a/src/settings.js
View file @f9490e6
+++ b/src/settings.js
View file @f9490e6
@@ -2,7 +2,7 @@ module.exports = {
  /**
   * @description 网站标题
   */
-  title: '基础框架',
+  title: '爱奇艺小卡',
  /**
   * @description 是否显示 tagsView
   */
--- a/src/views/aiqiyi/index.vue
View file @f9490e6
+++ b/src/views/aiqiyi/index.vue
View file @f9490e6
@@ -20,22 +20,23 @@
            :value="item.value"
          />
        </el-select>
-        <el-select v-model="searchObj.channel" filterable class="filter-item" clearable size="mini" placeholder="请选择渠道">
+        <!-- <el-select v-model="searchObj.channel" filterable class="filter-item" clearable size="mini" placeholder="请选择渠道">
          <el-option
            v-for="item in dictMap.channel"
            :key="item.value"
            :label="item.label"
            :value="item.value"
          />
-        </el-select>
+        </el-select> -->
        <el-select v-model="searchObj.region" filterable class="filter-item" clearable size="mini" placeholder="请选择地区">
          <el-option
-            v-for="item in dictMap.origin"
+            v-for="item in dictMap['region']"
            :key="item.value"
            :label="item.label"
            :value="item.value"
          />
        </el-select>
+        <el-input v-model="searchObj.channel" clearable size="small" placeholder="请输入渠道" style="width: 200px;" class="filter-item" />
        <el-input v-model="searchObj.cardNum" clearable size="small" placeholder="请输入卡号" style="width: 200px;" class="filter-item" />
        <el-input v-model="searchObj.batch" clearable size="small" placeholder="请输入批次（数字）" style="width: 200px;" class="filter-item" />
        <el-input v-model="searchObj.rcvMobile" clearable size="small" placeholder="请输入手机号" style="width: 200px;" class="filter-item" />
@@ -108,7 +109,7 @@ export default {
      vipTypeList: [{ label: '爱奇艺包月', value: '1' }, { label: '爱奇艺包年', value: '4' }],
      statusList: [{ label: '未兑换', value: '0' }, { label: '已兑换', value: '1' }, { label: '兑换失败', value: '2' }, { label: '已失效', value: '3' }],
      total: 0,
-      tableHeight: '',
+      tableHeight: 800,
      searchObj: {
        page: 0,
        size: 20,
@@ -127,13 +128,13 @@ export default {
  },
  created() {
    this.$nextTick(() => {
-      this.getDictMap('channel,origin')
+      this.getDictMap('region')
      this.getSmallSellList()
    })
  },
  mounted() {
    this.$nextTick(() => {
-      this.tableHeight = window.innerHeight - (window.innerWidth < 1530 ? 300 : 280)
+      this.tableHeight = window.innerHeight - (window.innerWidth < 1200 ? 280 : 260)
    })
  },
  methods: {
--- a/src/views/dashboard/BarChart.vue
View file @f9490e6
+++ b/src/views/dashboard/BarChart.vue
View file @f9490e6
@@ -143,6 +143,11 @@ export default {
            name: '标签人数分布',
            type: 'bar',
            data: [],
+            barWidth: 60,
+            label: {
+              show: true,
+              position: 'insideLeft'
+            },
            itemStyle: {
              color: (params) => {
                return this.colorList[params.dataIndex]
@@ -164,7 +169,7 @@ export default {
      console.log(123)
      console.log(this.optionData)
      const keyArray = Object.keys(this.optionData)
-      let yAxis = []
+      const yAxis = []
      const xAxis = []
      if (typeof this.optionData[keyArray[0]] !== 'object') {
        keyArray.forEach(item => {
@@ -173,20 +178,13 @@ export default {
        })
        console.log(yAxis, xAxis)
      } else {
-        if (keyArray.length > 1) {
+        keyArray.forEach(item => {
-          keyArray.forEach(item => {
+          const array = Object.keys(this.optionData[item])
-            const array = Object.keys(this.optionData[item])
+          array.forEach(itemArray => {
-            array.forEach(itemArray => {
+            yAxis.push(item + ':' + itemArray)
-              yAxis.push(item + ':' + itemArray)
+            xAxis.push(this.optionData[item][itemArray])
-              xAxis.push(this.optionData[item][itemArray])
-            })
-          })
-        } else {
-          yAxis = Object.keys(this.optionData[keyArray[0]])
-          yAxis.forEach(item => {
-            xAxis.push(this.optionData[keyArray[0]][item])
          })
-        }
+        })
      }
      const option = {
        yAxis: {
--- a/src/views/login.vue
View file @f9490e6
+++ b/src/views/login.vue
View file @f9490e6
@@ -3,7 +3,7 @@
    <index-bg />
    <div class="loginBox">
      <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
-        <h3 class="title" style="position: relative">基础框架<span style="color: #fff;z-index: 999;font-size: 12px;position: absolute;top: 4px;right: 10px" /></h3>
+        <h3 class="title" style="position: relative">爱奇艺小卡<span style="color: #fff;z-index: 999;font-size: 12px;position: absolute;top: 4px;right: 10px" /></h3>
        <el-form-item prop="username">
          <el-input v-model="loginForm.username" :validate-event="false" class="login-input" type="text" size="mini" placeholder="账号" style="width: 400px;">
            <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />