lilei 2 năm trước cách đây
mục cha
commit
bc77510b78

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

@@ -10,10 +10,10 @@
               <span class="zhuyao"> {{ item.productCode }}</span>
             </div>
             <div class="info">
-              <span class="ciyao"> {{ item.productTypeName3 }}</span>
+              <span class="ciyao"> {{ item.productBrandName + item.productTypeName3 }}</span>
             </div>
             <div class="info">
-              <span class="warning" v-if="curTab==1"> {{ item.resultQty }}</span>
+              <span class="warning" v-if="curTab==1"> {{ item.resultQty||'--' }}</span>
               <span class="warning" v-if="curTab==2"> {{ item.resultAmount | montionFilter }}</span>
             </div>
           </div>
@@ -28,10 +28,10 @@
               <span class="zhuyao"> {{ item.productCode }}</span>
             </div>
             <div class="info">
-              <span class="ciyao"> {{ item.productTypeName3 }}</span>
+              <span class="ciyao"> {{ item.productBrandName + item.productTypeName3 }}</span>
             </div>
             <div class="info">
-              <span class="warning" v-if="curTab==1"> {{ item.resultQty }}</span>
+              <span class="warning" v-if="curTab==1"> {{ item.resultQty||'--' }}</span>
               <span class="warning" v-if="curTab==2"> {{ item.resultAmount | montionFilter }}</span>
             </div>
           </div>

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

@@ -1,6 +1,6 @@
 <template>
   <div class="left-bottom">
-    <dv-capsule-chart :config="config" style="width:100%;height:505px" />
+    <dv-capsule-chart :config="config" style="width:96%;height:505px" />
   </div>
 </template>
 

+ 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.182/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: {