Prechádzať zdrojové kódy

Merge branch 'feature_20240910_AI参谋跳转高销额列表' into uat

zhujindu 1 rok pred
rodič
commit
a86edfacdd

+ 53 - 47
src/components/tabBar.vue

@@ -1,39 +1,42 @@
 <template>
   <div>
-      <van-tabbar v-model="ActiveMessage" @change="tabBarChange" active-color="#0057ba" inactive-color="#222">
-        <van-tabbar-item name="home">
-          <span>首页</span>
-          <template #icon>
-            <van-icon :name="tabBarActive == 'home' ? honeselect: home"/>
-          </template>
-        </van-tabbar-item>
-<!--        <van-tabbar-item name="ai" >-->
-<!--          <span>AI参谋</span>-->
-<!--          <template #icon>-->
-<!--            <van-icon :name="tabBarActive == 'ai' ? aiselect : ai"/>-->
-<!--          </template>-->
-<!--        </van-tabbar-item>-->
-        <van-tabbar-item name="deviceWithin">
-          <span>计划内</span>
-          <template #icon>
-            <van-icon :name="tabBarActive == 'deviceWithin' ? jihuaselect : jihua"/>
-          </template>
-        </van-tabbar-item>
-        <van-tabbar-item name="outsidelist">
-          <span>计划外</span>
-          <template #icon>
-            <van-icon :name="tabBarActive == 'outsidelist' ? outselect : out"/>
-          </template>
-        </van-tabbar-item>
-        <van-tabbar-item name="MyList">
-          <span>我的</span>
-          <template #icon>
-            <van-icon :name="tabBarActive == 'MyList' ? storeselect : store"/>
-          </template>
-        </van-tabbar-item>
-      </van-tabbar>
-    </div>
-
+    <van-tabbar
+      v-model="ActiveMessage"
+      @change="tabBarChange"
+      active-color="#0057ba"
+      inactive-color="#222">
+      <van-tabbar-item name="home">
+        <span>首页</span>
+        <template #icon>
+          <van-icon :name="tabBarActive == 'home' ? honeselect : home" />
+        </template>
+      </van-tabbar-item>
+      <van-tabbar-item name="ai">
+        <span>AI参谋</span>
+        <template #icon>
+          <van-icon :name="tabBarActive == 'ai' ? aiselect : ai" />
+        </template>
+      </van-tabbar-item>
+      <van-tabbar-item name="deviceWithin">
+        <span>计划内</span>
+        <template #icon>
+          <van-icon :name="tabBarActive == 'deviceWithin' ? jihuaselect : jihua" />
+        </template>
+      </van-tabbar-item>
+      <van-tabbar-item name="outsidelist">
+        <span>计划外</span>
+        <template #icon>
+          <van-icon :name="tabBarActive == 'outsidelist' ? outselect : out" />
+        </template>
+      </van-tabbar-item>
+      <van-tabbar-item name="MyList">
+        <span>我的</span>
+        <template #icon>
+          <van-icon :name="tabBarActive == 'MyList' ? storeselect : store" />
+        </template>
+      </van-tabbar-item>
+    </van-tabbar>
+  </div>
 </template>
 
 <script>
@@ -52,8 +55,8 @@ export default {
   props: {
     tabBarActive: {
       type: String,
-      default: 'home'
-    }
+      default: "home",
+    },
   },
   data() {
     return {
@@ -68,26 +71,29 @@ export default {
       out: out,
       outselect: outselect,
       tabBarAct: this.tabBarActive,
-      show:false
-    }
+      show: false,
+    };
   },
   computed: {
     ActiveMessage: {
       get() {
-        return this.tabBarAct = this.tabBarActive;
+        return (this.tabBarAct = this.tabBarActive);
       },
       set(newValue) {
         return newValue;
-      }
-    }
+      },
+    },
   },
   methods: {
     tabBarChange(index) {
-      if(localStorage.getItem('loginName')=='lihaoyang.sm'||localStorage.getItem('loginName')=='zhangjunyang.sm'){
-        this.show=true
+      if (
+        localStorage.getItem("loginName") == "lihaoyang.sm" ||
+        localStorage.getItem("loginName") == "zhangjunyang.sm"
+      ) {
+        this.show = true;
       }
-      this.$router.push({name: index + ""})
+      this.$router.push({ name: index + "" });
     },
-  }
-}
-</script>
+  },
+};
+</script>

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 548 - 524
src/views/deviceOutside/topStore.vue


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 654 - 562
src/views/intelligence/index.vue