首页修改

src/views/wel/components/sales-reached.vue

@@ -43,46 +43,46 @@
         </el-card>
       </div>
     </span>
-    <span v-else>
-      <!--<div class="home-container" v-if="sysType != 2">-->
-      <!--  <el-card class="home-container__card">-->
-      <!--    <div class="title">-->
-      <!--    <span>-->
-      <!--      当月报价-->
-      <!--    </span>-->
-      <!--      <span>-->
-      <!--      <i-->
-      <!--          class="el-icon-refresh-right"-->
-      <!--          style="cursor: pointer;font-size:20px"-->
-      <!--          @click="refresh"-->
-      <!--      ></i>-->
-      <!--    </span>-->
-      <!--    </div>-->
-      <!--    <div class="content" v-loading="loading">-->
-      <!--      <div style="display:flex">-->
-      <!--        <div id="ringData" ref="ringData" style="width:20vw;height:33vh"/>-->
-      <!--        <div>-->
-      <!--          <div class="content_item">-->
-      <!--            <div class="content_item_num">{{ data.grossAmount }}</div>-->
-      <!--            <div class="content_item_text">订单总金额</div>-->
-      <!--          </div>-->
-      <!--          <div class="content_item">-->
-      <!--            <div class="content_item_num">{{ data.reachAmount }}</div>-->
-      <!--            <div class="content_item_text">达成</div>-->
-      <!--          </div>-->
-      <!--          <div class="content_item">-->
-      <!--            <div class="divider"/>-->
-      <!--          </div>-->
-      <!--          <div class="content_item">-->
-      <!--            <div class="content_item_num">{{ data.notReachAmount }}</div>-->
-      <!--            <div class="content_item_text">未达成</div>-->
-      <!--          </div>-->
-      <!--        </div>-->
-      <!--      </div>-->
-      <!--    </div>-->
-      <!--  </el-card>-->
-      <!--</div>-->
-      <!--<domSales v-if="sysType == 2"/>-->
+    <span v-else-if="sysType == 5">
+      <div class="home-container" v-if="sysType != 2">
+        <el-card class="home-container__card">
+          <div class="title">
+          <span>
+            当月报价
+          </span>
+            <span>
+            <i
+                class="el-icon-refresh-right"
+                style="cursor: pointer;font-size:20px"
+                @click="refresh"
+            ></i>
+          </span>
+          </div>
+          <div class="content" v-loading="loading">
+            <div style="display:flex">
+              <div id="ringData" ref="ringData" style="width:20vw;height:33vh"/>
+              <div>
+                <div class="content_item">
+                  <div class="content_item_num">{{ data.grossAmount }}</div>
+                  <div class="content_item_text">订单总金额</div>
+                </div>
+                <div class="content_item">
+                  <div class="content_item_num">{{ data.reachAmount }}</div>
+                  <div class="content_item_text">达成</div>
+                </div>
+                <div class="content_item">
+                  <div class="divider"/>
+                </div>
+                <div class="content_item">
+                  <div class="content_item_num">{{ data.notReachAmount }}</div>
+                  <div class="content_item_text">未达成</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </el-card>
+      </div>
+      <domSales v-if="sysType == 2"/>
     </span>
   </div>
 </template>

src/views/wel/components/sales-trend.vue

@@ -301,7 +301,6 @@ export default {
       commoDity2() {
           // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
           let myChart = this.$echarts.init(document.getElementById("commoDity2"));
-          const colors = ["#5470C6", "#91CC75", "#EE6666", "#00008b"];
           // 绘制图表
           myChart.setOption({
               tooltip: {
@@ -373,7 +372,7 @@ export default {
                       yAxisIndex: 0,
                       tooltip: {
                           valueFormatter: function (value) {
-                              return value + ' ml';
+                              return value + ' 条';
                           }
                       },
                       data: this.numberList2
@@ -384,7 +383,7 @@ export default {
                       yAxisIndex: 1,
                       tooltip: {
                           valueFormatter: function (value) {
-                              return value + ' ml';
+                              return value + ' 元';
                           }
                       },
                       data: this.amountList2

src/views/wel/home/defaultPage.vue

@@ -2,15 +2,15 @@
   <div class="container">
     <quick-launch class="item1" :sysType="sysType" />
     <audit-data class="item2" v-if="sysType !== 999" :sysType="sysType"/>
-    <realtime-data class="item3" v-if="sysType !== 999" :sysType="sysType"/>
+    <realtime-data class="item3" v-if="sysType !== 999 && sysType !== 11" :sysType="sysType"/>
     <sales-reached class="item4" :sysType="sysType" v-if="sysType!=4||roleName!='采购'"/>
 
       <!--新加的-->
-      <xinsales-reached class="item4" :sysType="sysType" v-if="(sysType!=4||roleName!='采购') && $store.getters.userInfo.tenant_id !== 577435"/>
+      <xinsales-reached class="item4" :sysType="sysType" v-if="sysType==11 && $store.getters.userInfo.tenant_id !== 577435"/>
 
-    <sales-trend :class="sysType!=5 && sysType!=4?'item3':'item5'" :sysType="sysType" v-if="sysType!=4||roleName!='采购'"/>
+    <sales-trend :class="sysType!=5 && sysType!=4?'item3':'item5'" :sysType="sysType" v-if="(sysType!=4||roleName!='采购') && sysType != 2 && sysType != 6"/>
       <!--新家的表格-->
-      <xinsales-trend class="item5" :sysType="sysType" v-if="sysType!=4||roleName!='采购'"/>
+      <xinsales-trend class="item5" :sysType="sysType" v-if="sysType==11"/>
 
     <charge-today class="item6" :sysType="sysType" v-if="(sysType!=4||roleName!='采购')&&sysType !== 999"/>
     <pay-today class="item7" :sysType="sysType" v-if="(sysType!=4||roleName!='采购')&&sysType !== 999"/>