首頁 探索 說明
註冊 登入
bill
/
fuse-code
1
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Merge branch 'v1.9.0' of http://192.168.0.115:3000/bill/fuse-code into v1.9.0

xzw 2 月之前
父節點
d18bb525e3 c05e43a5ad
當前提交
6a71ad22dc
共有 5 個文件被更改，包括 23 次插入 和 11 次删除
分割檢視 顯示文件統計
  1. 2 2
      index.html
  2. 1 1
      offline.html
  3. 二進制
      public/oldfavicon.ico
  4. 19 2
      src/api/floder.ts
  5. 1 6
      src/model/index.ts

+ 2 - 2
index.html
查看文件 

@@ -24,11 +24,11 @@
 
         console.log(appParam, basePath, 6666)
 
         if (appParam.app == '1') {
 
           faviconPath = basePath + 'fire.ico';
 
-        } else if (appParam.app == '2' && appParam.isSample == '0') {
 
+        } else if (appParam.app == '2' && appParam.isSample == '1') {
 
           faviconPath = basePath + 'police.ico';
 
         } else if (appParam.app == '3') {
 
           faviconPath = basePath + 'jmlogo.png';
 
-        } else if (appParam.app == '2' && appParam.isSample == '1') {
 
+        } else if (appParam.app == '2' && appParam.isSample == '0') {
 
           faviconPath = basePath + 'logo_big.ico';
 
         }

+ 1 - 1
offline.html
查看文件 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
   <head>
 
     <meta charset="UTF-8" />
 
-    <link rel="icon" type="image/svg+xml" href="/favicon.ico" />
 
+    <link rel="icon" type="image/svg+xml" href="/oldfavicon.ico" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <title>案件信息</title>
 
     <link rel="stylesheet" type="text/css" href="./lib/Cesium/Widgets/CesiumWidget/CesiumWidget.css">

二進制
public/oldfavicon.ico
查看文件


+ 19 - 2
src/api/floder.ts
查看文件 

@@ -42,6 +42,7 @@ export const fetchFloders = async () => {
 
       })
 
     })
 
   }
 
+  console.log('floders', floders)
 
   await Promise.all(otherFloders.map(async of => {
 
     const kybl = await axios.get(of.ex, { params: { caseId: params.caseId } })
 
     if (kybl) {
 
@@ -54,5 +55,21 @@ export const fetchFloders = async () => {
 
       })
 
     }
 
   }))
 
-  return floders
 
-}
 
+
 
+  // 去重，主要是离线包出现这个问题
 
+  const uniqueFloders = floders.reduce((acc: Floders, current) => {
 
+    const isDuplicate = acc.some(item => 
+      item.filesTitle === current.filesTitle && 
+      item.filesTypeId === current.filesTypeId && 
+      item.filesId === current.filesId
 
+    );
 
+    
+    if (!isDuplicate) {
 
+      acc.push(current);
 
+    }
 
+    
+    return acc;
 
+  }, []);
 
+  console.log('uniqueFloders', uniqueFloders)
 
+  return uniqueFloders
 
+}

+ 1 - 6
src/model/index.ts
查看文件 

@@ -14,9 +14,7 @@ export type { ModelExpose }
 
 
 export const fuseModel = Symbol('fuse')
 
 export const currentModel = ref<ModelType>(fuseModel)
 
-watchEffect(() => {
 
-  console.error(currentModel.value, 'currentModel')
 
-}, { flush: 'sync'  })
 
+
 
 export const modelProps: ModelProps = reactive({ type: currentModel, callback: null })
 
 export const getModelTypeDesc = (model: ModelType) => {
 
   if (model === fuseModel) {
 
@@ -39,8 +37,6 @@ const _loadModel = (() => {
 
   let oldResult: Promise<ModelExpose>
 
 
   return (modelType: ModelType) => {
 
-    console.log(oldModelType, modelType, 'oldModelType')
 
-    console.log(deepIsRevise(oldModelType, modelType), 'oldModelType')
 
     if (!deepIsRevise(oldModelType, modelType)) {
 
       return oldResult
 
     }
 
@@ -54,7 +50,6 @@ const _loadModel = (() => {
 
           resolve(data)
 
         }
 
       }
 
-      console.log(modelType, oldModelType, '不是吧')
 
       currentModel.value = modelType
 
     })
 
   }