bill 2 дней назад
Родитель
Сommit
be8aa5774f
6 измененных файлов с 10 добавлено и 8 удалено
  1. 1 1
      src/app.vue
  2. 1 1
      src/layout/edit/scene-select.vue
  3. 2 1
      src/store/sys.ts
  4. 1 2
      src/utils/unset.ts
  5. 1 1
      src/views/login.vue
  6. 4 2
      vite.config.ts

+ 1 - 1
src/app.vue

@@ -44,7 +44,7 @@
   </ConfigProvider>
   <Login v-else />
 
-  <p class="botton-marker">
+  <p class="botton-marker" v-if="fuseModels.length > 0">
     <img src="/images/logo_police.png" /><span class="s1">&</span>
     <img src="/images/logo_4dage.png" /><span class="s2">|</span
     >公安部科技强警基础工作计划(2022JC13)

+ 1 - 1
src/layout/edit/scene-select.vue

@@ -22,7 +22,7 @@
           style="width: 244px"
         />
       </div>
-      <div class="table-layout" v-if="origin.length">
+      <div class="table-layout">
         <Tabs v-model:activeKey="type">
           <TabPane v-for="current in types" :key="current" :tab="current">
             <Table

+ 2 - 1
src/store/sys.ts

@@ -104,7 +104,7 @@ export let isUnset = stackVar(false);
 export const unSetModelUpdate = (run: () => void) => {
   const pop = isUnset.push(true)
   run();
-  nextTick(pop);
+    setTimeout(pop, 500)
 };
 export const autoSetModeCallback = <T extends object>(
   current: T,
@@ -139,6 +139,7 @@ export const autoSetModeCallback = <T extends object>(
   const handler = (newv: UnwrapRef<T>, oldv?: UnwrapRef<T>) => {
     if (isSave || isUnset.value || isLeaveIng) return;
     if (!setting.isUpdate || setting.isUpdate(newv, oldv)) {
+      console.error('handler')
       isEdit.value || enterEdit();
       isOld.value || enterOld();
       saveCallback && sysBus.on("save", saveCallback, { last });

+ 1 - 2
src/utils/unset.ts

@@ -5,11 +5,10 @@ export const unsetFactory = () => {
   let isUnSet = false;
   
   const unSet = (fn: () => void) => {
-    console.error('unset')
     const pop = isStoreUnset.push(true)
     isUnSet = true;
     fn();
-    nextTick(pop)
+    setTimeout(pop, 500)
   };
 
   return {

+ 1 - 1
src/views/login.vue

@@ -115,7 +115,7 @@ const login = (username: string, password: string) => {
 };
 
 if (import.meta.env.DEV) {
-  login("super-admin", "Aa123456");
+  login("qyc001", "Aa123456");
 }
 </script>
 

+ 4 - 2
vite.config.ts

@@ -83,7 +83,9 @@ export default defineConfig({
       input
     },
   },
-  plugins: [vue(), mkcert() ],
+  plugins: [vue(), 
+    // mkcert() 
+  ],
   css: {
     preprocessorOptions: {
       less: {
@@ -111,7 +113,7 @@ export default defineConfig({
     port: 7173,
     // open: true,
     proxy: proxy,
-    https: true
+    // https: true
   },
   preview: {
     proxy