fanzhen1231

2019-12-31 19:08:14 +08:00
parent d95e7ce2a4
commit 47660dbc63
4 changed files with 38 additions and 24 deletions
--- a/src/components/chartsCont/ChartsCont.vue
+++ b/src/components/chartsCont/ChartsCont.vue
@@ -1,6 +1,6 @@
 <template>
  <div>
-    <div class="chartsCont" v-if="transBefore">
+    <div class="chartsCont" v-if="transBefore&&!loadings">
      <Echarts
        v-if="indStatic!==0"
        :echartsDatarts="echartsDatarts"
@@ -8,11 +8,6 @@
        :echartsDatartsPie="echartsDatartsPie"
      ></Echarts>
      <el-table :data="tableData" style="width: 100%" height="360" ref="table">
-        <!-- <el-table-column fixed prop="date" label="日期" width="150" sortable></el-table-column>
-        <el-table-column prop="name" label="姓名" width="120" sortable></el-table-column>
-        <el-table-column prop="province" label="省份" width="120" sortable></el-table-column>
-        <el-table-column prop="city" label="市区" width="120" sortable></el-table-column>
-        <el-table-column prop="address" label="地址" width="300" sortable></el-table-column>-->
        <el-table-column
          :prop="item.labelId"
          :label="item.label"
@@ -69,7 +64,8 @@
      <div class="tableExplain">{{transBefore.tableExplain}}</div>
      <!-- 指标弹窗 -->
    </div>
-    <div v-if="!transBefore" class="tishi54">暂无数据</div>
+    <div v-if="!transBefore&&!loadings" class="tishi54">暂无数据</div>
+    <div v-loading="loadings" class="tishi54"></div>
  </div>
 </template>

@@ -126,6 +122,11 @@ export default {
    advancedStates: {
      type: Boolean,
      required: true
+    },
+    // 加载状态
+    loadings: {
+      type: Boolean,
+      required: true
    }
  },
  data () {
@@ -366,7 +367,9 @@ export default {
      // 执行状态
      hangZhiState: false,
      // 高级查询数据
-      startsyui: false
+      startsyui: false,
+      // 初始化左侧状态
+      leftState: false
    }
  },
  watch: {
@@ -568,7 +571,11 @@ export default {
            this.$nextTick(() => {
              console.log(this.hangZhiState, 'this.hangZhiState')
              this.$store.state.advancedSearchState = false
-              this.getDatas()
+              if (this.leftState) {
+                this.getDatas()
+              } else {
+                this.leftState = true
+              }
            })
          }
          // 调接口拿到所有当前分类下的所有的指标、地区、时间
@@ -582,7 +589,6 @@ export default {
    stateTells (val) {
      console.log(val, 'jjjjjj')
      if (val) {
-        console.log(val, 'jjjjjj')
        if (JSON.parse(sessionStorage.getItem('classFiyData')) && JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id)) {
          this.transBefore = {}
          this.transBefore.tableExplain = JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.tableExplain
@@ -598,15 +604,7 @@ export default {
          this.$store.state.transBefore = this.transBefore
          // 全局永久不变数据
          this.$store.state.noChangeData = JSON.parse(JSON.stringify(this.transBefore))
-        } else {
-          console.log('走else')
        }
-        // } else {
-        //   console.log(this.defaultDataRight, '获取左侧选中数据555')
-        //   console.log(this.$store.state.selectData, 'this.$store.state.selectData')
-        //   console.log(this.$store.state.selectfilter, 'this.$store.state.selectfilter')
-        //   this.getDatas()
-        // }
      }
    },
    // 筛选
@@ -1048,7 +1046,6 @@ export default {
    },
    // 获取后台数据表中的数据
    getDatas () {
-      console.log('执行getDatas')
      if (!this.$store.state.advancedSearchState) {
        // 初始化计算数据
        if (this.transBefore) {
@@ -1145,6 +1142,7 @@ export default {
              this.$emit('prentsState', false)
            }
            this.hangZhiState = true
+            this.$emit('update:loading', false)
          } else {
            this.transBefore = null
            // this.$store.state.transdtr = null
@@ -1153,17 +1151,18 @@ export default {
            this.$store.state.noChangeData = null
            // 调用父组件的comTime方法告诉父组件重置状态
            this.$parent.comTime({ name: '', extendData: '', active: true })
+            this.$store.state.noDataState = false
+            this.$emit('update:loading', false)
          }
          if (this.$route.query.type !== 'area') {
            this.$store.state.SelecttDimension.col = 'zb'
            this.$store.state.SelecttDimension.row = 'sj'
          }
-          this.$emit('stateDataGet', false)
+          // this.$emit('stateDataGet', false)
        }).catch((fail) => {
          console.log(fail, 2369)
        })
      } else {
-        console.log('zhixingelse')
        this.transBefore = this.$store.state.transBefore
        this.$store.state.noChangeData = JSON.parse(JSON.stringify(this.transBefore))
      }
@@ -1201,8 +1200,11 @@ export default {
          this.transBefore = transBefore
          // 全局永久不变数据
          this.$store.state.noChangeData = JSON.parse(JSON.stringify(transBefore))
+          this.$emit('update:loading', false)
        } else {
          this.$store.state.transBefore = null
+          this.$store.state.noDataState = false
+          this.$emit('update:loading', false)
        }
        // 告诉父组件我完成任务重置状态
        this.$emit('prentsState', false)
@@ -1306,7 +1308,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .tishi54 {
-  margin-top: 3rem;
+  margin-top: 12rem;
  font-size: 2rem;
  text-align: center;
  color: #ccc;
--- a/src/components/chartsCut/ChartsCut.vue
+++ b/src/components/chartsCut/ChartsCut.vue
@@ -104,6 +104,11 @@ export default {
    labelAreaStateks: {
      type: Boolean,
      required: true
+    },
+    // 加载状态
+    loading: {
+      type: Boolean,
+      required: true
    }
  },
  components: {
@@ -342,9 +347,11 @@ export default {
          // 默认选中第一个
          this.cityDefaultNameTime = { name: this.cityDataTime[0].name, activeIndex: 0 }
          this.$store.state.selectData = this.cityDataTime[0].extendData
-          // console.log(this.$store.state.selectData, 'this.cityDataTime[0].indexID')
          // 告诉父组件我获取到了
          this.$emit('stateTell', true)
+          if (!this.$route.query.type !== 'area') {
+            this.$emit('update:loading', false)
+          }
        }
      }).catch((fail) => {
        console.log(fail)
--- a/src/store.js
+++ b/src/store.js
@@ -95,7 +95,9 @@ export default new Vuex.Store({
    advanceQueryInit: {
      areaName: [],
      labelName: []
-    }
+    },
+    // 没数据状态
+    noDataState: true
  },
  mutations: {},
  actions: {
--- a/src/views/datasweb/Datasweb.vue
+++ b/src/views/datasweb/Datasweb.vue
@@ -191,6 +191,7 @@
                :areaDimensionStateS="areaDimensionStateS"
                @emmitStateAd="emmitStateAd"
                :labelAreaStateks="labelAreaStateks"
+                :loading.sync="loading"
                ref="childChartsCut"
              ></ChartsCut>
              <!-- 列表内容 -->
@@ -212,6 +213,7 @@
                :advancedStates="advancedStates"
                @tellParentsShowClos="tellParentsShowClos"
                @tellChangeFan="tellChangeFan"
+                :loadings.sync="loading"
              ></ChartsCont>
            </div>
            <div class="container">
@@ -329,6 +331,7 @@ export default {
  },
  data () {
    return {
+      loading: true,
      // 左侧当前默认
      defaultSelectLies: null,
      // 右侧默认显示数据