diff --git a/web/src/api/fileSynchronization/index.ts b/web/src/api/fileSynchronization/index.ts index dd2cd3f..9245554 100644 --- a/web/src/api/fileSynchronization/index.ts +++ b/web/src/api/fileSynchronization/index.ts @@ -63,6 +63,13 @@ export function automaticFileBackup(params:any) { params:params, }); } +export function automaticFileBackupByIds(params:any) { + return request({ + url: '/experimentalData/ts-files/automaticFileBackupByIds', + method: 'post', + params:params, + }); +} //获取url export function obtainUrl(params:any) { return request({ @@ -95,3 +102,27 @@ export function compareMinio(params:any) { params:params, }); } +//文件差异-新增全部 +export function compareLocalList(params:any) { + return request({ + url: '/experimentalData/ts-files/compareLocalList', + method: 'post', + params:params, + }); +} +//文件差异变更全部 +export function compareMd5List(params:any) { + return request({ + url: '/experimentalData/ts-files/compareMd5List', + method: 'post', + params:params, + }); +} +//文件差异-缺失全部 +export function compareMinioList(params:any) { + return request({ + url: '/experimentalData/ts-files/compareMinioList', + method: 'post', + params:params, + }); +} diff --git a/web/src/components/trajectory/index.vue b/web/src/components/trajectory/index.vue index 33e5b82..945cb08 100644 --- a/web/src/components/trajectory/index.vue +++ b/web/src/components/trajectory/index.vue @@ -1,139 +1,296 @@ - \ No newline at end of file +onBeforeUnmount(() => { + window.removeEventListener('resize', handleWindowResize) +}) + +// ==================== 响应式监听 ==================== +watch(() => props.qvehuan, (newVal) => { + isRouteInitialized.value = newVal + updateRoute() +}) + +watch(() => props.coordinates, () => { + updateRoute() +}, { deep: true }) + + + \ No newline at end of file diff --git a/web/src/views/special/document/index.vue b/web/src/views/special/document/index.vue index bae6319..95d496c 100644 --- a/web/src/views/special/document/index.vue +++ b/web/src/views/special/document/index.vue @@ -89,16 +89,16 @@ function gettreedata() { getNodesTree(treeForm.value).then((res: any) => { treedata.value = res.data treeloading.value = false - if( treedata.value[0]){ + if (treedata.value[0]) { pathid.value = treedata.value[0].id - nextTick(() => { - treeRef.value?.setCurrentKey(pathid.value); - }); - getdata() - }else{ + nextTick(() => { + treeRef.value?.setCurrentKey(pathid.value); + }); + getdata() + } else { tableData.value.length = 0 } - + }) } const pathid = ref() @@ -589,7 +589,23 @@ const title1 = ref('') const isViewfile = ref(false) const fileType = ref('') function openPreview(row: any) { - if (getFileExtension(row.fileName) == 'pdf' || getFileExtension(row.fileName) == 'xlsx'|| getFileExtension(row.fileName) == 'xls' || getFileExtension(row.fileName) == 'docx' || getFileExtension(row.fileName) == 'doc' || getFileExtension(row.fileName) == 'bin') { + console.log(row) + // if(row.fileSize > '2'){ + // ElMessageBox.confirm( + // '此文件内存过大无法预览,是否立即下载该文件?', + // '警告', + // { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning', + // } + // ) + // .then(() => { + // window.open(row.url); + // }) + // return + // } + if (getFileExtension(row.fileName) == 'pdf' || getFileExtension(row.fileName) == 'xlsx' || getFileExtension(row.fileName) == 'xls' || getFileExtension(row.fileName) == 'docx' || getFileExtension(row.fileName) == 'doc' || getFileExtension(row.fileName) == 'bin') { title1.value = row.fileName ViewfileUrl.value = row.url isViewfile.value = true @@ -669,7 +685,7 @@ const FILE_ICONS = { txt: TextImg }; // 获取文件图标 -const fileIcon = (row:any) => { +const fileIcon = (row: any) => { const ext = row.fileName.split('.').pop()?.toLowerCase() || 'unknown'; return FILE_ICONS[ext as keyof typeof FILE_ICONS] || (row.type == 'ZIP' ? ZipImg : TextImg); }; @@ -754,21 +770,20 @@ const fileIcon = (row:any) => { - + @@ -1022,9 +1111,9 @@ const tabs = ref(1) {{ data.fileName }}({{ data.isFile == 'FOLDER' ? data.children.length : data.fileSize + 'MB' }}) - ({{ data.station == '1' ? '新增' : + @@ -1042,12 +1131,12 @@ const tabs = ref(1) -
-
新增内容
-
变更内容
-
缺失内容
+
新增文件
+
修改文件
+
删除文件
@@ -1086,7 +1175,7 @@ const tabs = ref(1) + @pagination="diffSure(false)">
@@ -1129,7 +1218,7 @@ const tabs = ref(1) + @pagination="diffChange(false)">
@@ -1171,7 +1260,7 @@ const tabs = ref(1) + @pagination="diffMiss(false)">
@@ -1306,7 +1395,7 @@ const tabs = ref(1) .tree_left { width: 49%; - height: calc(78vh); + height: calc(77vh); .tree_title { @@ -1327,7 +1416,7 @@ const tabs = ref(1) padding: 5px; background-color: green; color: #fff; - margin-bottom: 5px !important; + // margin-bottom: 5px !important; } .custom-tree-node2 { @@ -1468,4 +1557,45 @@ const tabs = ref(1) border-bottom: 3px solid #409eff; } } + +// +.legend { + width: 40%; + display: flex; + align-items: center; + justify-content: space-between; + background-color: #409eff; + padding: 5px 8px; + box-sizing: border-box; + border-radius: 4px; + color: #fff; + + .legend_box { + display: flex; + align-items: center; + + .legend_color1 { + width: 14px; + height: 14px; + background-color: green; + } + + .legend_color2 { + width: 14px; + height: 14px; + background-color: red; + } + + .legend_color3 { + width: 14px; + height: 14px; + background-color: yellow; + } + + .legend_text { + font-size: 14px; + margin-left: 10px; + } + } +}