Merge branch 'feature_20260402_指标修改' into uat(dev)

src/views/componentsTarget/createStoreBJ.vue

@@ -48,45 +48,16 @@
       </van-col>
       <van-col span="12">
         <p>
-          <span class="colLabel colLabel_TCFX">同城分销</span>
+          <span class="colLabel colLabel_TCFX">仿石漆店</span>
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.fsqShopMonthAct) }}</span>
         </p>
       </van-col>
       <van-col span="12">
         <p>
-          <span class="colLabel colLabel_TCFX">同城分销</span>
-        </p>
-      </van-col>
-      <van-col span="12">
-        <p>
-          涂料店：<span class="colorbalck">{{
-            Micrometer(reportTargetAll.tcfxTlShopMonthAct)
-          }}</span>
-        </p>
-      </van-col>
-      <van-col span="12">
-        <p>
-          涂料店：<span class="colorbalck">{{
-            Micrometer(reportTargetAll.tcfxTlShopYearAct)
-          }}</span>
-          <span class="colorbalck" v-if="reportTargetAll.tcfxTlShopYearRate">
-            ({{ reportTargetAll.tcfxTlShopYearRate }}%)
-          </span>
-          <span class="colorbalck" v-else>({{ '-' }})</span>
-        </p>
-      </van-col>
-
-      <van-col span="12">
-        <p style="margin-top: 0">
-          厨卫店：
-          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxOtherShopMonthAct) }}</span>
-        </p>
-      </van-col>
-      <van-col span="12">
-        <p style="margin-top: 0">
-          厨卫店：
-          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxOtherShopYearAct) }}</span>
-          <span class="colorbalck" v-if="reportTargetAll.tcfxOtherShopYearRate">
-            ({{ reportTargetAll.tcfxOtherShopYearRate }}%)
+          <span class="colLabel colLabel_TCFX">仿石漆店</span>
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.fsqShopYearAct) }}</span>
+          <span class="colorbalck" v-if="reportTargetAll.fsqShopYearRate">
+            ({{ reportTargetAll.fsqShopYearRate }}%)
           </span>
           <span class="colorbalck" v-else>({{ '-' }})</span>
         </p>

src/views/componentsTarget/placeOrder.vue

@@ -16,18 +16,6 @@
         <span class="colorbalck">{{ reportTargetAll.controlledShopMonthOrderRate }}%</span>
       </p>
     </van-col>
-    <van-col span="12">
-      <p>
-        <span class="colLabel colLabel_FX">分销店</span>
-        <span class="colorbalck">{{ Micrometer(reportTargetAll.fxOrderShopMonthAct) }}</span>
-      </p>
-    </van-col>
-    <van-col span="12">
-      <p>
-        <span class="colLabel colLabel_FX">分销店</span
-        ><span class="colorbalck">{{ reportTargetAll.fxShopMonthOrderRate }}%</span>
-      </p>
-    </van-col>
     <div>
       <div class="backLeft back"></div>
       <div class="backRight back"></div>
@@ -45,38 +33,14 @@
       </van-col>
       <van-col span="12">
         <p>
-          <span class="colLabel colLabel_TCFX">同城分销</span>
-        </p>
-      </van-col>
-      <van-col span="12">
-        <p>
-          <span class="colLabel colLabel_TCFX">同城分销</span>
-        </p>
-      </van-col>
-      <van-col span="12">
-        <p>
-          涂料店：
-          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxTlOrderShopMonthAct) }}</span>
+          <span class="colLabel colLabel_TCFX">同城分销近3个月</span>
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxOrderShopMonthAct) }}</span>
         </p>
       </van-col>
       <van-col span="12">
         <p>
-          涂料店：
-          <span class="colorbalck">{{ reportTargetAll.tcfxTlShopMonthOrderRate }}%</span>
-        </p>
-      </van-col>
-      <van-col span="12">
-        <p style="margin-top: 0">
-          厨卫店：
-          <span class="colorbalck">{{
-            Micrometer(reportTargetAll.tcfxOtherOrderShopMonthAct)
-          }}</span>
-        </p>
-      </van-col>
-      <van-col span="12">
-        <p style="margin-top: 0">
-          厨卫店：
-          <span class="colorbalck">{{ reportTargetAll.tcfxOtherShopMonthOrderRate }}%</span>
+          <span class="colLabel colLabel_TCFX">同城分销近3个月</span>
+          <span class="colorbalck"> {{ reportTargetAll.tcfxShopMonthOrderRate }}% </span>
         </p>
       </van-col>
     </div>

src/views/componentsTarget/visitedRealTime.vue

@@ -84,16 +84,17 @@
           <span class="colorbalck"> ({{ reportTargetAll.jpShopVisitMonthRate }}%) </span>
         </p>
       </van-col>
-      <van-col span="24">
+      <van-col span="12">
         <p>
-          <span class="colLabel colLabel_TCFX">同城分销近3月</span>
+          <span class="colLabel colLabel_TCFX">同城分销</span>
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxShopVisitDayNum) }}</span>
         </p>
       </van-col>
-      <van-col span="24">
+      <van-col span="12">
         <p>
-          <span style="font-weight: 600">近3月</span>
-          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxTlShopVisitMonthNum) }}</span>
-          <span class="colorbalck"> ({{ reportTargetAll.tcfxTlShopVisitMonthRate }}%) </span>
+          <span class="colLabel colLabel_TCFX">同城分销近3月</span>
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxShopVisitMonthNum) }}</span>
+          <span class="colorbalck"> ({{ reportTargetAll.tcfxShopVisitMonthRate }}%) </span>
         </p>
       </van-col>
       <!-- <van-col span="12">