Home Explore Help
Sign In
jianyu
/
web
6
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix: 广告组件参数等

yangfeng 4 years ago
parent
02199bea37
commit
a416d421d9
6 changed files with 44 additions and 54 deletions
Unified View Show Diff Stats
  1. 1 0
      public/index.html
  2. 1 3
      src/components/chart/BarLineChart.vue
  3. 0 1
      src/components/chart/MapChart.vue
  4. 2 2
      src/components/common/ContentLayout.vue
  5. 40 47
      src/views/portrayal/UnitPortrayal.vue
  6. 0 1
      src/views/portrayal/components/UnitChart.vue

+ 1 - 0
public/index.html
View File 

@@ -28,6 +28,7 @@
 
   <style>
 
   <style>
 
     .big-member-page {
 
     .big-member-page {
 
       margin: 0 auto;
 
       margin: 0 auto;
 
+      width: 1200px;
 
     }
 
     }
 
   </style>
 
   </style>
 
   <body style="background-color: #f2f2f4;">
 
   <body style="background-color: #f2f2f4;">

+ 1 - 3
src/components/chart/BarLineChart.vue
View File 

@@ -119,9 +119,7 @@ export default {
 
   },
 
   },
 
   computed: {},
 
   computed: {},
 
   watch: {},
 
   watch: {},
 
-  mounted () {
 
-    console.log(this.datas)
 
-  },
 
+  mounted () {},
 
   methods: {
 
   methods: {
 
     extend (chart) {
 
     extend (chart) {
 
       chart.setOption({
 
       chart.setOption({

+ 0 - 1
src/components/chart/MapChart.vue
View File 

@@ -9,7 +9,6 @@
 
 </template>
 
 </template>
 
 <script>
 
 <script>
 
 const mapJson = require('../../assets/js/china.json')
 
 const mapJson = require('../../assets/js/china.json')
 
-console.log(mapJson)
 
 export default {
 
 export default {
 
   name: 'chart',
 
   name: 'chart',
 
   props: {
 
   props: {

+ 2 - 2
src/components/common/ContentLayout.vue
View File 

@@ -67,12 +67,12 @@ export default {
 
         num: this.adNum
 
         num: this.adNum
 
       }
 
       }
 
 
 
-      if (!params.adCode) {
 
+      if (!params.code) {
 
         const routeName = this.$route.name
 
         const routeName = this.$route.name
 
         params.code = this.adCodeMap[routeName]
 
         params.code = this.adCodeMap[routeName]
 
       }
 
       }
 
 
 
-      if (!params.adCode) return
 
+      if (!params.code) return
 
 
 
       const { data } = await getAdList(params)
 
       const { data } = await getAdList(params)

+ 40 - 47
src/views/portrayal/UnitPortrayal.vue
View File 

@@ -1,50 +1,48 @@
 
 <template>
 
 <template>
 
-  <div class="unit-portrayal" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.8)">
 
-    <Layout>
 
-      <div class="unit-portrayal-content">
 
-        <div class="unit-type">
 
-          <div class="u-name">{{info.buyerName}}</div>
 
-          <div class="u-type">
 
-            <div class="u-t-item">
 
-              <span class="area-icon"></span>
 
-              <span>所在地：{{info.province}} {{info.city}}</span>
 
-            </div>
 
-            <div class="u-t-item">
 
-              <span class="type-icon"></span>
 
-              <span>采购单位类型：{{info.buyerClass}}</span>
 
-            </div>
 
+  <Layout class="unit-portrayal">
 
+    <div class="unit-portrayal-content">
 
+      <div class="unit-type">
 
+        <div class="u-name">{{info.buyerName}}</div>
 
+        <div class="u-type">
 
+          <div class="u-t-item">
 
+            <span class="area-icon"></span>
 
+            <span>所在地：{{info.province}} {{info.city}}</span>
 
+          </div>
 
+          <div class="u-t-item">
 
+            <span class="type-icon"></span>
 
+            <span>采购单位类型：{{info.buyerClass}}</span>
 
           </div>
 
           </div>
 
         </div>
 
         </div>
 
-        <div class="unit-info">
 
-          <div class="u-i-box">
 
-            <div class="b-item">
 
-              <span>{{info.buyerCount}}</span>
 
-              <span>采购项目数量</span>
 
-            </div>
 
-            <div class="b-item">
 
-              <span>{{info.buyerScale}}</span>
 
-              <span>采购规模</span>
 
-            </div>
 
-            <div class="b-item">
 
-              <span>{{info.winnerCount}}</span>
 
-              <span>中标企业数量</span>
 
-            </div>
 
-            <div class="b-item">
 
-              <span>{{info.otherWinner}}</span>
 
-              <span>外省中标企业</span>
 
-            </div>
 
-            <div class="b-item">
 
-              <span>{{info.fail_count}}</span>
 
-              <span>流标记录数</span>
 
-            </div>
 
+      </div>
 
+      <div class="unit-info">
 
+        <div class="u-i-box">
 
+          <div class="b-item">
 
+            <span>{{info.buyerCount}}</span>
 
+            <span>采购项目数量</span>
 
+          </div>
 
+          <div class="b-item">
 
+            <span>{{info.buyerScale}}</span>
 
+            <span>采购规模</span>
 
+          </div>
 
+          <div class="b-item">
 
+            <span>{{info.winnerCount}}</span>
 
+            <span>中标企业数量</span>
 
+          </div>
 
+          <div class="b-item">
 
+            <span>{{info.otherWinner}}</span>
 
+            <span>外省中标企业</span>
 
+          </div>
 
+          <div class="b-item">
 
+            <span>{{info.fail_count}}</span>
 
+            <span>流标记录数</span>
 
           </div>
 
           </div>
 
-          <div class="u-i-tip">数据统计范围：{{info.start}}-{{info.end}}</div>
 
         </div>
 
         </div>
 
-        <unit-list></unit-list>
 
-        <unit-chart v-on:baseInfo="getBaseInfo"></unit-chart>
 
+        <div class="u-i-tip">数据统计范围：{{info.start}}-{{info.end}}</div>
 
       </div>
 
       </div>
 
-    </Layout>
 
-  </div>
 
+      <unit-list></unit-list>
 
+      <unit-chart v-on:baseInfo="getBaseInfo"></unit-chart>
 
+    </div>
 
+  </Layout>
 
 </template>
 
 </template>
 
 <script>
 
 <script>
 
 import Layout from '@/components/common/ContentLayout'
 
 import Layout from '@/components/common/ContentLayout'
 
@@ -80,7 +78,6 @@ export default {
 
   },
 
   },
 
   methods: {
 
   methods: {
 
     getBaseInfo (data) {
 
     getBaseInfo (data) {
 
-      console.log(data, 'data')
 
       if (!data) return
 
       if (!data) return
 
       this.info = data
 
       this.info = data
 
     }
 
     }
 
@@ -89,11 +86,7 @@ export default {
 
 </script>
 
 </script>
 
 <style lang="scss" scoped>
 
 <style lang="scss" scoped>
 
 .unit-portrayal{
 
 .unit-portrayal{
 
-  width: 1200px;
 
-  margin: 32px auto;
 
-  .unit-portrayal{
 
-    width: 920px;
 
-  }
 
+  // width: 1200px;
 
   .unit-type{
 
   .unit-type{
 
     padding: 32px 40px;
 
     padding: 32px 40px;
 
     background: #fff;
 
     background: #fff;

+ 0 - 1
src/views/portrayal/components/UnitChart.vue
View File 

@@ -254,7 +254,6 @@ export default {
 
           info.otherWinner = res.data.otherProvincesWinnerCount ? res.data.otherProvincesWinnerCount + '个' : '--'
 
           info.otherWinner = res.data.otherProvincesWinnerCount ? res.data.otherProvincesWinnerCount + '个' : '--'
 
           info.buyerScale = res.data.bidamount_count ? moneyUnit(res.data.bidamount_count) : '--'
 
           info.buyerScale = res.data.bidamount_count ? moneyUnit(res.data.bidamount_count) : '--'
 
           info.fail_count = res.data.fail_count ? res.data.fail_count + '条' : '--'
 
           info.fail_count = res.data.fail_count ? res.data.fail_count + '条' : '--'
 
-          console.log(info, 'info')
 
           this.$emit('baseInfo', info)
 
           this.$emit('baseInfo', info)
 
           // 年度项目统计图表数据
 
           // 年度项目统计图表数据
 
           if (res.data.yearData && Object.keys(res.data.yearData).length > 0) {
 
           if (res.data.yearData && Object.keys(res.data.yearData).length > 0) {