Browse Source

fix: 指标搜素bug-图标

“ystl_myq” 6 months ago
parent
commit
1637a4dd74

BIN
public/logo.png


BIN
public/logo@2x.png


+ 10 - 2
src/layout/components/sidebar/logo.vue

@@ -3,10 +3,13 @@ import { getTopMenu } from "@/router/utils";
 import { useNav } from "@/layout/hooks/useNav";
 import logoImg from "@/assets/logo.png";
 import logoImg2x from "@/assets/logo@2x.png";
+import { useRoute } from "vue-router";
+import { onMounted } from "vue";
+const $route = useRoute();
 const props = defineProps({
   collapse: Boolean
 });
-
+onMounted(() => {});
 const { title, getLogo } = useNav();
 </script>
 
@@ -20,7 +23,12 @@ const { title, getLogo } = useNav();
         class="sidebar-logo-link"
         :to="getTopMenu()?.path ?? '/'"
       >
-        <img :src="getLogo()" alt="logo" />
+        <!-- <img :src="logoImg" alt="logo"/>  -->
+        <img
+          :src="getLogo()"
+          alt="logo"
+          style=" height: 30px;margin-left: 5px"
+        />
         <span class="sidebar-title">{{ title }}</span>
       </router-link>
       <router-link

+ 1 - 1
src/layout/hooks - copy/useNav.ts

@@ -114,7 +114,7 @@ export function useNav() {
   /** 获取`logo` */
   function getLogo() {
     // return new URL("/logo.svg", import.meta.url).href;
-    return new URL("/logo.svg", import.meta.url).href;
+    return new URL("/logo.png", import.meta.url).href;
   }
 
   return {

+ 1 - 1
src/layout/hooks/useNav.ts

@@ -114,7 +114,7 @@ export function useNav() {
   /** 获取`logo` */
   function getLogo() {
     // return new URL("/logo.svg", import.meta.url).href;
-    return new URL("/logo.svg", import.meta.url).href;
+    return new URL("/logo.png", import.meta.url).href;
   }
 
   return {

+ 1 - 1
src/store/modules/user.ts

@@ -20,7 +20,7 @@ export const useUserStore = defineStore({
     // 是否勾选了登录页的免登录
     isRemembered: false,
     // 登录页的免登录存储几天,默认7天
-    loginDay: 0
+    loginDay: 7
   }),
   actions: {
     /** 存储用户名 */

+ 9 - 12
src/views/indexDefine/children/define.vue

@@ -47,19 +47,16 @@ const params = reactive({
     pageSize: 10,
     param: null,
     categoryName: null,
-    statue: null
+    statue: null,
+    orderField: "updateTime",
+    orderType: null
   },
   records: [],
   total: 0
 });
 // 分页
-const getQuotaPageListApi = async (orderField?: any, orderType?: any) => {
-  const { code, data } = await getQuotaPageList({
-    ...params.params,
-    orderField,
-    orderType
-  });
-  console.log("code", data);
+const getQuotaPageListApi = async () => {
+  const { code, data } = await getQuotaPageList(params.params);
   if (code === 200) {
     params.records = data.records;
     params.total = data.totalRow;
@@ -184,11 +181,11 @@ const formattedTime = time => {
 };
 const changeSort = ({ column, prop, order }) => {
   if (order === "ascending") {
-    console.log(11); // 正序
-    getQuotaPageListApi("updateTime", "升序");
+    params.params.orderType = "升序";
+    getQuotaPageListApi();
   } else if (order === "descending") {
-    console.log(22); // 反序
-    getQuotaPageListApi("updateTime", "降序");
+    params.params.orderType = "降序";
+    getQuotaPageListApi();
   }
 };
 </script>