Browse Source

bug 修复

lilei 2 years ago
parent
commit
4126d36e07

+ 1 - 1
src/views/bigScreen/fPanalysisReport/center-top.vue

@@ -26,7 +26,7 @@ export default {
 		> div{
 			width: 100%;
 			text-align: center;
-			color: #00aaff;
+			color: #5cc2f5;
       font-size:40px;
       height: 45px;
       line-height:45px;

+ 1 - 1
src/views/bigScreen/fPanalysisReport/right-bottom.vue

@@ -31,7 +31,7 @@
               <span class="ciyao"> {{ item.productTypeName3 }}</span>
             </div>
             <div class="info">
-              <span class="warning" v-if="curTab==1"> {{ item.totalQty }}</span>
+              <span class="warning" v-if="curTab==1"> {{ item.resultQty }}</span>
               <span class="warning" v-if="curTab==2"> {{ item.resultAmount | montionFilter }}</span>
             </div>
           </div>

+ 2 - 2
src/views/bigScreen/realTimeSalesReport/center-bottom.vue

@@ -38,8 +38,8 @@ export default {
         if (res.status == 200) {
           const ret = { category: [], barData: [] }
           res.data.map(item => {
-            ret.category.push(item.name)
-            ret.barData.push(item.value)
+            ret.category.push(item.productBrandName)
+            ret.barData.push(item.resultAmount)
           })
           this.$nextTick(() => {
             this.init(ret)

+ 14 - 9
src/views/bigScreen/realTimeSalesReport/center-map.vue

@@ -97,15 +97,20 @@ export default {
           item.properties.centroid || item.properties.center
       })
       const newData = []
+      const retData = []
       mydata.map((item) => {
-        if (cityCenter[item.name]) {
+        if (cityCenter[item.provinceName]) {
           newData.push({
-            name: item.name,
-            value: cityCenter[item.name].concat(item.value)
+            name: item.provinceName,
+            value: cityCenter[item.provinceName].concat(item.resultQty)
           })
         }
+        retData.push({
+          name: item.provinceName,
+          value: item.resultQty
+        })
       })
-      this.init(name, mydata, newData)
+      this.init(name, retData, newData)
     },
     init (name, data, data2) {
       // console.log(data2);
@@ -133,12 +138,12 @@ export default {
           inRange: {
             // 渐变颜色,从小到大
             color: [
-              '#c3d7df',
+              '#1781b5',
+              '#2f90b9',
               '#5cb3cc',
-              '#8abcd1',
               '#66a9c9',
-              '#2f90b9',
-              '#1781b5'
+              '#8abcd1',
+              '#c3d7df'
             ]
           },
           textStyle: {
@@ -169,7 +174,7 @@ export default {
               show: true,
               formatter: function (params) {
                 if (params.data) {
-                  return params.name + ':' + params.data['value']
+                  return params.name + ':' + params.data['value'] + '元'
                 } else {
                   return params.name
                 }

+ 8 - 1
src/views/bigScreen/realTimeSalesReport/left-bottom.vue

@@ -50,9 +50,16 @@ export default {
           console.log('销售金额top15省份', res)
         }
         if (res.status == 200) {
+          const ret = []
+          res.data.map(item => {
+            ret.push({
+              name: item.provinceName,
+              value: item.resultAmount
+            })
+          })
           this.config = {
             ...this.config,
-            data: res.data
+            data: ret
           }
           this.switper()
         } else {

+ 7 - 1
src/views/bigScreen/realTimeSalesReport/left-top.vue

@@ -37,7 +37,13 @@ export default {
           console.log('区域销售金额占比', res)
         }
         if (res.status == 200) {
-          const listData = res.data
+          const listData = []
+          res.data.map(item => {
+            listData.push({
+              name: item.subareaNames,
+              value: item.resultAmount
+            })
+          })
           this.$nextTick(() => {
             this.init(listData)
             this.switper()

+ 6 - 6
src/views/bigScreen/realTimeSalesReport/right-today.vue

@@ -9,13 +9,13 @@
               <span class="zhuyao"> {{ item.dealerName }}</span>
             </div>
             <div class="info col-2">
-              <span class="ciyao"> {{ item.dealerLevelName }}</span>
+              <span class="ciyao"> {{ item.dealerLevelDictValue }}</span>
             </div>
             <div class="info col-3">
-              <span class="warning"> {{ item.qty }}</span>
+              <span class="warning"> {{ item.resultQty }}</span>
             </div>
             <div class="info col-4">
-              <span class="warning"> {{ item.amount | montionFilter }}</span>
+              <span class="warning"> {{ item.resultAmount | montionFilter }}</span>
             </div>
           </div>
         </li>
@@ -28,13 +28,13 @@
               <span class="zhuyao"> {{ item.dealerName }}</span>
             </div>
             <div class="info col-2">
-              <span class="ciyao"> {{ item.dealerLevelName }}</span>
+              <span class="ciyao"> {{ item.dealerLevelDictValue }}</span>
             </div>
             <div class="info col-3">
-              <span class="warning"> {{ item.qty }}</span>
+              <span class="warning"> {{ item.resultQty }}</span>
             </div>
             <div class="info col-4">
-              <span class="warning"> {{ item.amount | montionFilter }}</span>
+              <span class="warning"> {{ item.resultAmount | montionFilter }}</span>
             </div>
           </div>
         </li>

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.215/ocs-admin',
+        target: 'http://192.168.0.182/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  Á·Ï°
-        target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
+        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
         ws: false,
         changeOrigin: true,
         pathRewrite: {