wangqi
/
EDFS-MCU
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: 一些标题名称修改

main
betaqi 2 months ago
parent
3ccfb7869a
commit
fc1598be6c
6 changed files with 20 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      index.html
  2. 1
      src/stores/transferData.ts
  3. 2
      src/views/layout/index.vue
  4. 9
      src/views/stationData/components/offTransferDlg.vue
  5. 7
      src/views/stationData/index.vue
  6. 11
      src/views/stationData/transferData.vue

2
index.html
Unescape View File

@ -5,7 +5,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="icon" href="/favicon.ico"> <link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Vite App</title> <title>EMU-主机运维平台</title>
</head> </head>
<body> <body>

1
src/stores/transferData.ts
Unescape View File

@ -53,6 +53,7 @@ export const useTransferDataStore = defineStore('transfer', () => {
if (hasDevice) { if (hasDevice) {
hasDevice.lastUpdated = Date.now() hasDevice.lastUpdated = Date.now()
hasDevice.status = '在线' hasDevice.status = '在线'
hasDevice.footprint = formatSizeFromKB(Number(feedback[4] || 0))
} else { } else {
const num = feedback[4] || 0 const num = feedback[4] || 0
const device: IOnlineDevice = { const device: IOnlineDevice = {

2
src/views/layout/index.vue
Unescape View File

@ -13,7 +13,7 @@
fill="currentColor"></path> fill="currentColor"></path>
</svg> </svg>
<h2 class="pl-8px text-16px font-bold" v-show="!isCollapse"> <h2 class="pl-8px text-16px font-bold" v-show="!isCollapse">
数据迁移管理平台 EMU-主机运维平台
</h2> </h2>
</RouterLink> </RouterLink>
<el-menu class="layout-menu" :default-active="activeMenu" @select="menuSelect" router :collapse="isCollapse"> <el-menu class="layout-menu" :default-active="activeMenu" @select="menuSelect" router :collapse="isCollapse">

9
src/views/stationData/components/offTransferDlg.vue
Unescape View File

@ -1,12 +1,13 @@
<template> <template>
<EdfsDialog :title="'数据迁移'" :is-show="visible" width="580px" @on-close="close" @on-save="onSave"> <EdfsDialog :title="'数据导出'" :is-show="visible" width="580px" @on-close="close" @on-save="onSave">
<div class="flex-col gap-10 w-80% m-x-30px"> <div class="flex-col gap-10 w-80% m-x-30px">
<el-row> <el-row>
<div class="label"> <div class="label">
<span class="require">*</span> <span class="require">*</span>
客户端IP: 云端IP:
</div> </div>
<el-input v-model="form.clientIp" class="flex-1" placeholder="请输入客户端IP" /> <el-input v-model="form.clientIp" class="flex-1" placeholder="请输入云端IP:
" />
</el-row> </el-row>
</div> </div>
</EdfsDialog> </EdfsDialog>
@ -84,7 +85,7 @@ const ipPattern =
function verifyData() { function verifyData() {
if (!form.value.clientIp) { if (!form.value.clientIp) {
message.error('请输入客户端IP') message.error('请输入云端IP')
return true return true
} }

7
src/views/stationData/index.vue
Unescape View File

@ -28,7 +28,7 @@
<div class="footer row-end-0"> <div class="footer row-end-0">
<div class="m-l-auto p-b-8"> <div class="m-l-auto p-b-8">
<el-button type="primary" style="height: 28px; padding: 0 12px" color="#4B9E5F" <el-button type="primary" style="height: 28px; padding: 0 12px" color="#4B9E5F"
@click="onTransferData">迁移数据</el-button> @click="onTransferData">设备详情</el-button>
</div> </div>
</div> </div>
</div> </div>
@ -36,7 +36,8 @@
</EdfsWrap> </EdfsWrap>
</template> </template>
<EdfsWrap title="迁移历史" shape="circle" shapeColor="#F1BF63" class="flex-1" useScrollBar> <EdfsWrap :title="`${env.VITE_APP_ENV == 'local' ? '数据迁移历史' : '数据导入历史'}`" shape="circle" shapeColor="#F1BF63"
class="flex-1" useScrollBar>
<div class="station-list-flow"> <div class="station-list-flow">
<div class="station-item" v-for="item in siteList" :key="item.id"> <div class="station-item" v-for="item in siteList" :key="item.id">
<div class="title bg-[#F1BF63]"> <div class="title bg-[#F1BF63]">
@ -71,7 +72,7 @@
<div class="body"> <div class="body">
<div class="info"> <div class="info">
<div class="info-item"> <div class="info-item">
<div class="info-item-label">迁移时间</div> <div class="info-item-label">导入时间</div>
<div class="info-item-value">{{ item.create_time }}</div> <div class="info-item-value">{{ item.create_time }}</div>
</div> </div>
</div> </div>

11
src/views/stationData/transferData.vue
Unescape View File

@ -12,7 +12,7 @@
</template> </template>
<template v-else> <template v-else>
<el-button type="primary" @click="onBatchTransfer"> <i class="i-mdi:database-arrow-right-outline mr-1" /> <el-button type="primary" @click="onBatchTransfer"> <i class="i-mdi:database-arrow-right-outline mr-1" />
批量迁移 </el-button> {{ isonLineTransfer ? '数据迁移' : '数据导出' }} </el-button>
<el-button v-if="isonLineTransfer" type="primary" @click="onBatchUpgrade"> <i <el-button v-if="isonLineTransfer" type="primary" @click="onBatchUpgrade"> <i
class="i-codicon:chip mr-1" />批量升级 class="i-codicon:chip mr-1" />批量升级
</el-button> </el-button>
@ -34,7 +34,8 @@
<div class="flex items-center gap-col-2" v-if="!(isBatchTransfer || isBatchUpgrade)"> <div class="flex items-center gap-col-2" v-if="!(isBatchTransfer || isBatchUpgrade)">
<template v-if="env.VITE_APP_ENV == 'local'"> <template v-if="env.VITE_APP_ENV == 'local'">
<el-tooltip content="数据迁移" v-if="isonLineTransfer ? item.status === '在线' : true"> <el-tooltip :content="isonLineTransfer ? '数据迁移' : '数据导出'"
v-if="isonLineTransfer ? item.status === '在线' : true">
<i class="i-mdi:database-arrow-right-outline :hover:color-[#8ACE6A] color-[#4B9E5F] cursor-pointer text-20px" <i class="i-mdi:database-arrow-right-outline :hover:color-[#8ACE6A] color-[#4B9E5F] cursor-pointer text-20px"
@click="onTransfer(item)"></i> @click="onTransfer(item)"></i>
</el-tooltip> </el-tooltip>
@ -343,7 +344,6 @@ function zmqExportCb(msg: PubMsgData) {
const isLineFeed = feedback[2] && feedback[2].includes('\n') const isLineFeed = feedback[2] && feedback[2].includes('\n')
if (isLineFeed) { if (isLineFeed) {
if (zmqExportMSG.value) { if (zmqExportMSG.value) {
curTransferLog.value.at(-1)!.msg += feedback[2] curTransferLog.value.at(-1)!.msg += feedback[2]
} else { } else {
@ -390,6 +390,7 @@ function zmqExportCb(msg: PubMsgData) {
transferStatus.value = 'failed' transferStatus.value = 'failed'
} }
exportPubDeviceMap.delete(msg.id) exportPubDeviceMap.delete(msg.id)
zmqExportMSG.value = ''
} }
} }
} }
@ -424,6 +425,7 @@ function zmqTimeoutCb(msg: TimeoutMsg) {
exportPubDeviceMap.delete(msg.timeoutId) exportPubDeviceMap.delete(msg.timeoutId)
closeTransferMask() closeTransferMask()
transferStatus.value === 'failed' transferStatus.value === 'failed'
zmqExportMSG.value = ''
} }
} }
@ -755,6 +757,7 @@ function zmqImportCb(msg: PubMsgData) {
status: 'error' status: 'error'
}) })
} }
importMsg.value = ''
processNextImport() processNextImport()
} }
} }
@ -773,7 +776,7 @@ function zmqImportTimeoutCb(msg: TimeoutMsg) {
}) })
importQueue.value.shift() importQueue.value.shift()
isImporting.value = false isImporting.value = false
importMsg.value = ''
processNextImport() processNextImport()
} }
} }

Write Preview
Loading…
Cancel
Save