2 Commits a5e8d7cac0 ... 3666ed3d13

Autore SHA1 Messaggio Data
  tym 3666ed3d13 Merge branch 'feature_20250917_调色机预警' into uat(dev) 1 mese fa
  sunny c842480d47 feature_20250917_调色机预警 1 mese fa
1 ha cambiato i file con 62 aggiunte e 61 eliminazioni
  1. 62 61
      src/views/home/hintTabPage/index.vue

+ 62 - 61
src/views/home/hintTabPage/index.vue

@@ -120,6 +120,67 @@
             </div>
           </div>
         </van-collapse-item>
+        <!-- 调色预警 -->
+        <van-collapse-item name="5">
+          <template #title>
+            <div class="itemHeader" @click.stop>
+              <span class="itemTitle">{{ colorWarning.title }}</span>
+              <el-popover
+                placement="right"
+                trigger="click"
+                popper-class="hintPopover"
+                v-if="colorWarning.tip">
+                <div
+                  class="popoverConten"
+                  v-for="(item, index) in colorWarning.tip"
+                  :key="index">
+                  {{ item }}
+                </div>
+                <div slot="reference" class="hintIconBox">
+                  <img class="hintIcon" :src="hintIcon" />
+                </div>
+              </el-popover>
+            </div>
+          </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>
+                    <div class="right">
+                      <div class="lebel">当月未调色:</div>
+                      <div class="value valueIsClick" @click="colorWarningClick(val, key, val.mdwqsNum)">
+                        {{ Micrometer(val.colorMonth) }}家
+                      </div>
+                    </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="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" />
+            </div>
+          </div>
+        </van-collapse-item>
         <!-- 色卡 -->
         <van-collapse-item name="4" v-if="userType != 1 && userType != 3">
           <template #title>
@@ -199,67 +260,7 @@
             </div>
           </div>
         </van-collapse-item>
-         <!-- 调色预警 -->
-        <van-collapse-item name="5">
-          <template #title>
-            <div class="itemHeader" @click.stop>
-              <span class="itemTitle">{{ colorWarning.title }}</span>
-              <el-popover
-                placement="right"
-                trigger="click"
-                popper-class="hintPopover"
-                v-if="colorWarning.tip">
-                <div
-                  class="popoverConten"
-                  v-for="(item, index) in colorWarning.tip"
-                  :key="index">
-                  {{ item }}
-                </div>
-                <div slot="reference" class="hintIconBox">
-                  <img class="hintIcon" :src="hintIcon" />
-                </div>
-              </el-popover>
-            </div>
-          </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>
-                    <div class="right">
-                      <div class="lebel">当月未调色:</div>
-                      <div class="value valueIsClick" @click="colorWarningClick(val, key, val.mdwqsNum)">
-                        {{ Micrometer(val.colorMonth) }}家
-                      </div>
-                    </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="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" />
-            </div>
-          </div>
-        </van-collapse-item>
+         
       </van-collapse>
     </div>
   </div>