fix: 冲突

.env.production

@@ -3,7 +3,7 @@ VITE_PUBLIC_PATH = /
 
 # 线上环境路由历史模式（Hash模式传"hash"、HTML5模式传"h5"、Hash模式带base参数传"hash,base参数"、HTML5模式带base参数传"h5,base参数"）
 VITE_ROUTER_HISTORY = "hash"
-VITE_BASE_URL = "localhost:8080"
+VITE_BASE_URL = "http://172.16.9.165:8080"
 # 是否在打包时使用cdn替换本地库 替换 true 不替换 false
 VITE_CDN = false
 
@@ -11,6 +11,5 @@ VITE_CDN = false
 # 压缩时不删除原始文件的配置：gzip、brotli、both（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认）
 # 压缩时删除原始文件的配置：gzip-clear、brotli-clear、both-clear（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认）
 VITE_COMPRESSION = "none"
-
 # 下载模板链接
 VITE_BACKUP_URL= ""http://172.16.9.165:8765"

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

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 {

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 {

src/store/modules/user.ts

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

src/views/evaluate/children/change/mould/manageObject.vue

@@ -440,6 +440,18 @@ const handleCurrentIndexChange = (val: number) => {
 // 指标修改
 const updateAssessmentQuotaDetailsApi = async row => {
   const { msg, code } = await updateAssessmentQuotaDetails({ ...row });
+  Object.assign(editVxe, {
+    relationId: null,
+    startValue: null,
+    finalValue: null,
+    dataSource: null,
+    score: null,
+    assessmentObjectId: null,
+    assessmentModelId: null,
+    id: null,
+    dimId: null,
+    assessmentId: null
+  });
   if (code === 200) {
     getAssessmentQuotaDetailsApi();
     ElMessage.success("修改成功");

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>

src/views/indexDefine/children/import/index.vue

@@ -154,9 +154,7 @@ const stateDone = state => {
 
         <el-button class="mt-2">
           <el-icon> <Download /> </el-icon
-          ><a :href="backupUrl" download="指标导入模板.xlsx"
-            >下载空的模板表格</a
-          >
+          ><a :href="backupUrl" download="指标导入模板.xlsx" />
         </el-button>
       </div>
       <div class="w-full mt-4 bg p-3">