ソースを参照

Merge branch 'feature_20260227_首页指标添加数据' into dev(uat)

# Conflicts:
#	src/views/agentList/index.vue
zhujindu 6 日 前
コミット
f9ad1cc999
2 ファイル変更10 行追加5 行削除
  1. 7 4
      src/views/agentList/index.vue
  2. 3 1
      src/views/home/visitCollapse.vue

+ 7 - 4
src/views/agentList/index.vue

@@ -147,7 +147,6 @@
                     <el-popover
                     <el-popover
                       popper-class="zpover fsqDelivery"
                       popper-class="zpover fsqDelivery"
                       placement="bottom"
                       placement="bottom"
-                      width="120"
                       trigger="click"
                       trigger="click"
                       content="仿石漆配送商">
                       content="仿石漆配送商">
                       <div
                       <div
@@ -630,7 +629,7 @@ export default {
       },
       },
       {
       {
         passive: false,
         passive: false,
-      }
+      },
     );
     );
   },
   },
   methods: {
   methods: {
@@ -967,7 +966,7 @@ export default {
             location.lat,
             location.lat,
             location.lon,
             location.lon,
             location.lat,
             location.lat,
-            location.lon
+            location.lon,
           ).toFixed(2);
           ).toFixed(2);
           //  直接进入拜访 不校验经纬度
           //  直接进入拜访 不校验经纬度
           // localStorage.setItem('startTime', new Date());
           // localStorage.setItem('startTime', new Date());
@@ -1130,7 +1129,7 @@ export default {
           localStorage.setItem('lat', this.lat);
           localStorage.setItem('lat', this.lat);
           localStorage.setItem('lon', this.lon);
           localStorage.setItem('lon', this.lon);
           let PointSum = this.twoPointSum(TXisBD.lat, TXisBD.lon, TXisBD.lat, TXisBD.lon).toFixed(
           let PointSum = this.twoPointSum(TXisBD.lat, TXisBD.lon, TXisBD.lat, TXisBD.lon).toFixed(
-            2
+            2,
           );
           );
           addVisitsPosition({
           addVisitsPosition({
             chainId: val.chainId,
             chainId: val.chainId,
@@ -1581,4 +1580,8 @@ export default {
 .yu7Class p {
 .yu7Class p {
   margin: 0;
   margin: 0;
 }
 }
+.myPopover {
+  min-width: 100px;
+  width: auto;
+}
 </style>
 </style>

+ 3 - 1
src/views/home/visitCollapse.vue

@@ -77,6 +77,8 @@ export default {
         style.background = '#7ecef4';
         style.background = '#7ecef4';
       } else if (targetName == '粉料片区') {
       } else if (targetName == '粉料片区') {
         style.background = '#f19ec2';
         style.background = '#f19ec2';
+      } else if (targetName == '片区经销商(36城)') {
+        style.background = '#9ea4f1';
       }
       }
       return style;
       return style;
     },
     },
@@ -84,7 +86,7 @@ export default {
       if (this.empLevel != 2 && this.empLevel != 3) return;
       if (this.empLevel != 2 && this.empLevel != 3) return;
       store.dispatch(
       store.dispatch(
         'setActivaTypeStore',
         'setActivaTypeStore',
-        item1.targetName ? item1.targetName + '经销商' : item.targetName
+        item1.targetName ? item1.targetName + '经销商' : item.targetName,
       );
       );
       if (item2.targetName != '未拜访') return;
       if (item2.targetName != '未拜访') return;
       this.$router.push({
       this.$router.push({