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

# Conflicts:
#	src/views/week/daily.vue

src/views/deviceWithin/index.vue

@@ -235,7 +235,7 @@
                   width="200"
                   trigger="click">
                   <div v-if="item.storeLabels">
-                    <p>{{ timeData }}未通过的陈列任务:</p>
+                    <p>{{ timeData1 }}未通过的陈列任务:</p>
                     <p v-for="(tt, ind) in (item.storeLabels.targetOne + '').split(';')">
                       <template v-if="tt"> {{ ind + 1 }}、{{ tt }};</template>
                     </p>

src/views/home/ABtarget.vue

@@ -81,9 +81,9 @@
             :title="'瓷砖胶SAP(千元)'">
             <cizhuanjiaoSAP :reportTargetAll="reportTargetAll"></cizhuanjiaoSAP>
           </van-collapse-item>
-          <van-collapse-item v-if="GZdata" name="43" title="纯态之家SAP(千元)">
+          <!-- <van-collapse-item v-if="GZdata" name="43" title="纯态之家SAP(千元)">
             <chunTaiSAP :reportTargetAll="reportTargetAll"></chunTaiSAP>
-          </van-collapse-item>
+          </van-collapse-item> -->
           <van-collapse-item v-if="GZdata" name="42" title="商机关联的质感外墙业绩SAP(千元)">
             <van-row style="margin-top: -10px">
               <van-col span="12"><span class="leftTitle">本月</span></van-col

src/views/home/Atarget.vue

@@ -49,9 +49,9 @@
           :title="'瓷砖胶SAP(千元)'">
           <cizhuanjiaoSAP :reportTargetAll="reportTargetAll"></cizhuanjiaoSAP>
         </van-collapse-item>
-        <van-collapse-item v-if="GZdata" name="9" title="纯态之家SAP(千元)">
+        <!-- <van-collapse-item v-if="GZdata" name="9" title="纯态之家SAP(千元)">
           <chunTaiSAP :reportTargetAll="reportTargetAll"></chunTaiSAP>
-        </van-collapse-item>
+        </van-collapse-item> -->
         <van-collapse-item v-if="GZdata" name="10" title="商机关联的质感外墙业绩SAP(千元)">
           <van-row style="margin-top: -10px">
             <van-col span="12"><span class="leftTitle">本月</span></van-col

src/views/home/hintTabPage/index.vue

@@ -92,7 +92,7 @@
                     '填写率-本月：' +
                       report.reportData.fillingRate +
                       ';审批率-本月：' +
-                      report.reportData.approvalRate
+                      report.reportData.approvalRate,
                   )
                 ">
                 下属详情
@@ -130,10 +130,7 @@
                 trigger="click"
                 popper-class="hintPopover"
                 v-if="colorWarning.tip">
-                <div
-                  class="popoverConten"
-                  v-for="(item, index) in colorWarning.tip"
-                  :key="index">
+                <div class="popoverConten" v-for="(item, index) in colorWarning.tip" :key="index">
                   {{ item }}
                 </div>
                 <div slot="reference" class="hintIconBox">
@@ -144,37 +141,47 @@
           </template>
           <div class="pantoneContent">
             <div v-for="(val, key, index) in colorWarning.contentData" :key="index">
-                <div :class="['title',key=='keKong'?'kekong':'jinpai']">{{ key=='keKong'?'可控店':'金牌店' }}</div>
-                <div class="pantoneItem">
-                  <div class="firstItem item">
-                    <div class="left">
-                      <div class="lebel">滚动7天未调色：</div>
-                      <div class="value valueIsClick" @click="colorWarningClick(val, key, val.mdwqsNum)">
-                        {{ Micrometer(val.colorSeven) }}家
-                      </div>
+              <div :class="['title', key == 'keKong' ? 'kekong' : 'jinpai']">
+                {{ key == 'keKong' ? '可控店' : '金牌店' }}
+              </div>
+              <div class="pantoneItem">
+                <div class="firstItem item">
+                  <div class="left">
+                    <div class="lebel">滚动7天未调色：</div>
+                    <div
+                      class="value valueIsClick"
+                      @click="colorWarningClick(val, key, val.mdwqsNum)">
+                      {{ Micrometer(val.colorSeven) }}家
                     </div>
-                    <div class="right">
-                      <div class="lebel">当月未调色：</div>
-                      <div class="value valueIsClick" @click="colorWarningClick(val, key, val.mdwqsNum)">
-                        {{ Micrometer(val.colorMonth) }}家
-                      </div>
+                  </div>
+                  <div class="right">
+                    <div class="lebel">当月未调色：</div>
+                    <div
+                      class="value valueIsClick"
+                      @click="colorWarningClick(val, key, val.mdwqsNum)">
+                      {{ Micrometer(val.colorMonth) }}家
                     </div>
                   </div>
-                  <div class="secondItem item">
-                    <div class="left">
-                      <div class="lebel">从未调色：</div>
-                      <div class="value valueIsClick" @click="colorWarningClick(val, key, val.mdwqsNum)">
-                        {{ Micrometer(val.colorStop) }}家
-                      </div>
+                </div>
+                <div class="secondItem item">
+                  <div class="left">
+                    <div class="lebel">从未调色：</div>
+                    <div
+                      class="value valueIsClick"
+                      @click="colorWarningClick(val, key, val.mdwqsNum)">
+                      {{ Micrometer(val.colorStop) }}家
                     </div>
-                    <div class="right">
-                      <div class="lebel">布机但近两年DIS为0：</div>
-                      <div class="value valueIsClick" @click="colorWarningClick(val, key, val.mdwqsNum)">
-                        {{ Micrometer(val.colorDis) }}家
-                      </div>
+                  </div>
+                  <div class="right">
+                    <div class="lebel">布机但近两年DIS为0：</div>
+                    <div
+                      class="value valueIsClick"
+                      @click="colorWarningClick(val, key, val.mdwqsNum)">
+                      {{ Micrometer(val.colorDis) }}家
                     </div>
                   </div>
                 </div>
+              </div>
             </div>
             <div class="mask" v-if="colorWarning.contentLosding">
               <van-loading type="spinner" color="#1989fa" />
@@ -260,7 +267,6 @@
             </div>
           </div>
         </van-collapse-item>
-         
       </van-collapse>
     </div>
   </div>
@@ -342,25 +348,25 @@ export default {
               },
             ],
           },
+          // {
+          //   title: '同城分销-涂料店',
+          //   titleProp: 'TuLiao',
+          //   bagColor: '#88abda',
+          //   visitDetail: [
+          //     {
+          //       leftTable: '近2个月拜访率：',
+          //       leftProp: 'visitRateInThePastTwoMonths',
+          //       leftUnit: '%',
+          //       leftIsClick: false,
+          //       rightTable: '未拜访：',
+          //       rightProp: 'notVisited',
+          //       rightUnit: '家',
+          //       rightIsClick: true,
+          //     },
+          //   ],
+          // },
           {
-            title: '同城分销-涂料店',
-            titleProp: 'TuLiao',
-            bagColor: '#88abda',
-            visitDetail: [
-              {
-                leftTable: '近2个月拜访率：',
-                leftProp: 'visitRateInThePastTwoMonths',
-                leftUnit: '%',
-                leftIsClick: false,
-                rightTable: '未拜访：',
-                rightProp: 'notVisited',
-                rightUnit: '家',
-                rightIsClick: true,
-              },
-            ],
-          },
-          {
-            title: '同城分销-其他店',
+            title: '同城分销',
             titleProp: 'QiTa',
             bagColor: '#8f82bc',
             visitDetail: [
@@ -591,7 +597,7 @@ export default {
       }
     },
     getColorWarning() {
-       if (this.empLevel !== 4) {
+      if (this.empLevel !== 4) {
         this.colorWarning.contentLosding = true;
         getColorWarning().then((res) => {
           this.colorWarning.contentLosding = false;
@@ -730,7 +736,6 @@ export default {
     .pantoneContent {
       padding-bottom: 10px;
       .title {
-        
         padding: 2px 5px;
         border-radius: 2px;
         background-color: #13b5b1;
@@ -738,7 +743,7 @@ export default {
         display: inline-block;
         color: #fff;
       }
-      .kekong{
+      .kekong {
         color: #fff;
         height: 21px;
         margin-right: 6px;
@@ -752,7 +757,7 @@ export default {
         padding: 0 3px;
         background: rgb(235, 104, 119);
       }
-      .jinpai{
+      .jinpai {
         color: #fff;
         height: 21px;
         margin-right: 6px;