This commit is contained in:
2025-09-22 14:04:04 +08:00
parent c32381f8ed
commit 8910ccd63c
5 changed files with 94 additions and 47 deletions

View File

@@ -6,6 +6,11 @@
<option name="name" value="aliyun nexus" /> <option name="name" value="aliyun nexus" />
<option name="url" value="https://maven.aliyun.com/repository/public" /> <option name="url" value="https://maven.aliyun.com/repository/public" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="central" /> <option name="id" value="central" />
<option name="name" value="Central Repository" /> <option name="name" value="Central Repository" />

57
.idea/workspace.xml generated
View File

@@ -4,7 +4,14 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="71d19dd6-7472-4ebf-b309-b7afee3f99de" name="更改" comment="1" /> <list default="true" id="71d19dd6-7472-4ebf-b309-b7afee3f99de" name="更改" comment="1">
<change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/data/erp-cache.db-wal" beforeDir="false" afterPath="$PROJECT_DIR$/data/erp-cache.db-wal" afterDir="false" />
<change beforePath="$PROJECT_DIR$/electron-vue-template/src/renderer/components/amazon/AmazonDashboard.vue" beforeDir="false" afterPath="$PROJECT_DIR$/electron-vue-template/src/renderer/components/amazon/AmazonDashboard.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/electron-vue-template/src/renderer/components/rakuten/RakutenDashboard.vue" beforeDir="false" afterPath="$PROJECT_DIR$/electron-vue-template/src/renderer/components/rakuten/RakutenDashboard.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/electron-vue-template/src/renderer/components/zebra/ZebraDashboard.vue" beforeDir="false" afterPath="$PROJECT_DIR$/electron-vue-template/src/renderer/components/zebra/ZebraDashboard.vue" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -13,6 +20,13 @@
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
<option name="userSettingsFile" value="C:\Program Files\apache-maven-3.9.4\conf\settings.xml" />
</MavenGeneralSettings>
</option>
</component>
<component name="ProjectColorInfo">{ <component name="ProjectColorInfo">{
&quot;customColor&quot;: &quot;&quot;, &quot;customColor&quot;: &quot;&quot;,
&quot;associatedIndex&quot;: 0 &quot;associatedIndex&quot;: 0
@@ -22,21 +36,34 @@
<option name="autoscrollFromSource" value="true" /> <option name="autoscrollFromSource" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent">{ <component name="PropertiesComponent"><![CDATA[{
&quot;keyToString&quot;: { "keyToString": {
&quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;, "ModuleVcsDetector.initialDetectionPerformed": "true",
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, "RunOnceActivity.ShowReadmeOnStart": "true",
&quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager&quot;: &quot;true&quot;, "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager": "true",
&quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;, "RunOnceActivity.git.unshallow": "true",
&quot;git-widget-placeholder&quot;: &quot;master&quot;, "Spring Boot.ErpClientSbApplication.executor": "Debug",
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;, "Spring Boot.RuoYiApplication.executor": "Debug",
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;, "git-widget-placeholder": "master",
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;, "node.js.detected.package.eslint": "true",
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;, "node.js.detected.package.tslint": "true",
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;, "node.js.selected.package.eslint": "(autodetect)",
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot; "node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"settings.editor.selected.configurable": "MavenSettings",
"vue.rearranger.settings.migration": "true"
} }
}</component> }]]></component>
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
<component name="RunDashboard">
<option name="configurationTypes">
<set>
<option value="SpringBootApplicationConfigurationType" />
</set>
</option>
</component>
<component name="RunManager" selected="Spring Boot.RuoYiApplication"> <component name="RunManager" selected="Spring Boot.RuoYiApplication">
<configuration default="true" type="JetRunConfigurationType"> <configuration default="true" type="JetRunConfigurationType">
<module name="RuoYi-Vue" /> <module name="RuoYi-Vue" />

View File

@@ -300,16 +300,13 @@ onMounted(async () => {
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th width="130">ASIN</th> <th>ASIN</th>
<th>卖家/配送方</th> <th>卖家/配送方</th>
<th width="120">当前售价</th> <th>当前售价</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-if="paginatedData.length === 0"> <tr v-for="row in paginatedData" :key="row.asin">
<td colspan="3" class="empty-tip">暂无数据请导入ASIN列表</td>
</tr>
<tr v-else v-for="row in paginatedData" :key="row.asin">
<td>{{ row.asin }}</td> <td>{{ row.asin }}</td>
<td> <td>
<div class="seller-info"> <div class="seller-info">
@@ -324,6 +321,12 @@ onMounted(async () => {
</tbody> </tbody>
</table> </table>
</div> </div>
<div v-if="paginatedData.length === 0" class="empty-abs">
<div class="empty-container">
<div class="empty-icon">📄</div>
<div class="empty-text">暂无数据请导入ASIN列表</div>
</div>
</div>
<!-- 表格加载遮罩 --> <!-- 表格加载遮罩 -->
<div v-if="tableLoading" class="table-loading"> <div v-if="tableLoading" class="table-loading">
@@ -368,12 +371,15 @@ onMounted(async () => {
.progress-text { position: absolute; right: 0; font-size: 13px; color: #409EFF; font-weight: 500; } .progress-text { position: absolute; right: 0; font-size: 13px; color: #409EFF; font-weight: 500; }
.current-status { font-size: 12px; color: #606266; padding-left: 2px; } .current-status { font-size: 12px; color: #606266; padding-left: 2px; }
.table-container { display: flex; flex-direction: column; flex: 1; min-height: 400px; overflow: hidden; } .table-container { display: flex; flex-direction: column; flex: 1; min-height: 400px; overflow: hidden; }
.table-section { flex: 1; overflow: hidden; position: relative; background: #fff; border: 1px solid #ebeef5; border-radius: 4px; } .table-section { flex: 1; overflow: hidden; position: relative; background: #fff; border: 1px solid #ebeef5; border-radius: 4px; display: flex; flex-direction: column; }
.table-wrapper { height: 100%; overflow: auto; } .table-wrapper { flex: 1; overflow: auto; }
.table { width: 100%; border-collapse: collapse; font-size: 13px; } .table { width: 100%; border-collapse: collapse; font-size: 13px; table-layout: fixed; }
.table th { background: #f5f7fa; color: #909399; font-weight: 600; padding: 12px 8px; border-bottom: 2px solid #ebeef5; text-align: left; } .table th { background: #f5f7fa; color: #909399; font-weight: 600; padding: 12px 8px; border-bottom: 2px solid #ebeef5; text-align: left; }
.table td { padding: 10px 8px; border-bottom: 1px solid #f0f0f0; vertical-align: middle; } .table td { padding: 10px 8px; border-bottom: 1px solid #f0f0f0; vertical-align: middle; }
.table tbody tr:hover { background: #f9f9f9; } .table tbody tr:hover { background: #f9f9f9; }
.table th:nth-child(1), .table td:nth-child(1) { width: 33.33%; }
.table th:nth-child(2), .table td:nth-child(2) { width: 33.33%; }
.table th:nth-child(3), .table td:nth-child(3) { width: 33.33%; }
.seller-info { display: flex; align-items: center; gap: 4px; } .seller-info { display: flex; align-items: center; gap: 4px; }
.seller { color: #303133; font-weight: 500; } .seller { color: #303133; font-weight: 500; }
.shipper { color: #909399; font-size: 12px; } .shipper { color: #909399; font-size: 12px; }
@@ -384,6 +390,10 @@ onMounted(async () => {
.pagination-fixed { flex-shrink: 0; padding: 8px 12px; background: #f9f9f9; border-radius: 4px; display: flex; justify-content: center; border-top: 1px solid #ebeef5; margin-top: 8px; } .pagination-fixed { flex-shrink: 0; padding: 8px 12px; background: #f9f9f9; border-radius: 4px; display: flex; justify-content: center; border-top: 1px solid #ebeef5; margin-top: 8px; }
.empty-tip { text-align: center; color: #909399; padding: 16px 0; } .empty-tip { text-align: center; color: #909399; padding: 16px 0; }
.import-section[draggable], .import-section.drag-active { border: 1px dashed #409EFF; border-radius: 6px; } .import-section[draggable], .import-section.drag-active { border: 1px dashed #409EFF; border-radius: 6px; }
.empty-container { text-align: center; }
.empty-icon { font-size: 48px; margin-bottom: 12px; opacity: 0.6; }
.empty-text { font-size: 14px; color: #909399; }
.empty-abs { position: absolute; left: 0; right: 0; top: 48px; bottom: 0; display: flex; align-items: center; justify-content: center; }
</style> </style>
<script lang="ts"> <script lang="ts">

View File

@@ -327,10 +327,7 @@ onMounted(loadLatest)
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-if="paginatedData.length === 0"> <tr v-for="row in paginatedData" :key="row.productUrl + (row.productTitle || '')">
<td colspan="12" class="empty-tip">暂无数据请导入店铺名列表</td>
</tr>
<tr v-else v-for="row in paginatedData" :key="row.productUrl + (row.productTitle || '')">
<td class="truncate shop-col" :title="row.originalShopName">{{ row.originalShopName }}</td> <td class="truncate shop-col" :title="row.originalShopName">{{ row.originalShopName }}</td>
<td class="truncate url-col"> <td class="truncate url-col">
<el-input v-if="row.productUrl" :value="row.productUrl" readonly @click="$event.target.select()" size="small"/> <el-input v-if="row.productUrl" :value="row.productUrl" readonly @click="$event.target.select()" size="small"/>
@@ -364,6 +361,12 @@ onMounted(loadLatest)
</table> </table>
</div> </div>
<div v-if="paginatedData.length === 0" class="empty-abs">
<div class="empty-container">
<div class="empty-icon">📄</div>
<div class="empty-text">暂无数据请导入店铺名列表</div>
</div>
</div>
<!-- 表格加载遮罩 --> <!-- 表格加载遮罩 -->
<div v-if="tableLoading" class="table-loading"> <div v-if="tableLoading" class="table-loading">
@@ -513,19 +516,8 @@ onMounted(loadLatest)
color: #909399; color: #909399;
} }
.table-section { .table-section { flex: 1; overflow: hidden; position: relative; background: #fff; border: 1px solid #ebeef5; border-radius: 4px; display: flex; flex-direction: column; }
flex: 1; .table-wrapper { flex: 1; overflow: auto; }
overflow: hidden;
position: relative;
background: #fff;
border: 1px solid #ebeef5;
border-radius: 4px;
}
.table-wrapper {
height: 100%;
overflow: auto;
}
.table { .table {
width: 100%; width: 100%;
@@ -563,7 +555,11 @@ onMounted(loadLatest)
.shop-col { max-width: 160px; } .shop-col { max-width: 160px; }
.url-col { max-width: 220px; } .url-col { max-width: 220px; }
.empty-tip { text-align: center; color: #909399; padding: 16px 0; } .empty-tip { text-align: center; color: #909399; padding: 16px 0; }
.empty-container { text-align: center; }
.empty-icon { font-size: 48px; margin-bottom: 12px; opacity: 0.6; }
.empty-text { font-size: 14px; color: #909399; }
.import-section.drag-active { border: 1px dashed #409EFF; border-radius: 6px; } .import-section.drag-active { border: 1px dashed #409EFF; border-radius: 6px; }
.empty-abs { position: absolute; left: 0; right: 0; top: 48px; bottom: 0; display: flex; align-items: center; justify-content: center; }
.image-container { .image-container {
display: flex; display: flex;

View File

@@ -218,10 +218,7 @@ onMounted(async () => {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-if="paginatedData.length === 0"> <tr v-for="row in paginatedData" :key="row.shopOrderNumber + (row.productNumber || '')">
<td colspan="16" class="empty-tip">暂无数据请选择日期范围获取订单</td>
</tr>
<tr v-else v-for="row in paginatedData" :key="row.shopOrderNumber + (row.productNumber || '')">
<td>{{ row.orderedAt || '-' }}</td> <td>{{ row.orderedAt || '-' }}</td>
<td> <td>
<div class="image-container" v-if="row.productImage"> <div class="image-container" v-if="row.productImage">
@@ -252,6 +249,13 @@ onMounted(async () => {
</table> </table>
</div> </div>
<div v-if="paginatedData.length === 0" class="empty-abs">
<div class="empty-container">
<div class="empty-icon">📄</div>
<div class="empty-text">暂无数据请获取订单</div>
</div>
</div>
<!-- 表格加载遮罩 --> <!-- 表格加载遮罩 -->
<div v-if="loading && !allOrderData.length" class="table-loading"> <div v-if="loading && !allOrderData.length" class="table-loading">
<div class="spinner"></div> <div class="spinner"></div>
@@ -301,8 +305,8 @@ export default {
.empty-container { text-align: center; } .empty-container { text-align: center; }
.empty-icon { font-size: 48px; margin-bottom: 16px; opacity: 0.6; } .empty-icon { font-size: 48px; margin-bottom: 16px; opacity: 0.6; }
.empty-text { font-size: 14px; color: #909399; } .empty-text { font-size: 14px; color: #909399; }
.table-section { flex: 1; overflow: hidden; position: relative; background: #fff; border: 1px solid #ebeef5; border-radius: 4px; } .table-section { flex: 1; overflow: hidden; position: relative; background: #fff; border: 1px solid #ebeef5; border-radius: 4px; display: flex; flex-direction: column; }
.table-wrapper { height: 100%; overflow: auto; } .table-wrapper { flex: 1; overflow: auto; }
.table { width: 100%; border-collapse: collapse; font-size: 13px; } .table { width: 100%; border-collapse: collapse; font-size: 13px; }
.table th { background: #f5f7fa; color: #909399; font-weight: 600; padding: 12px 8px; border-bottom: 2px solid #ebeef5; text-align: left; } .table th { background: #f5f7fa; color: #909399; font-weight: 600; padding: 12px 8px; border-bottom: 2px solid #ebeef5; text-align: left; }
.table td { padding: 10px 8px; border-bottom: 1px solid #f0f0f0; vertical-align: middle; } .table td { padding: 10px 8px; border-bottom: 1px solid #f0f0f0; vertical-align: middle; }
@@ -317,6 +321,11 @@ export default {
@keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } } @keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } }
.pagination-fixed { flex-shrink: 0; padding: 8px 12px; background: #f9f9f9; border-radius: 4px; display: flex; justify-content: center; border-top: 1px solid #ebeef5; margin-top: 8px; } .pagination-fixed { flex-shrink: 0; padding: 8px 12px; background: #f9f9f9; border-radius: 4px; display: flex; justify-content: center; border-top: 1px solid #ebeef5; margin-top: 8px; }
.tag { display: inline-block; padding: 2px 6px; font-size: 12px; background: #ecf5ff; color: #409EFF; border-radius: 3px; } .tag { display: inline-block; padding: 2px 6px; font-size: 12px; background: #ecf5ff; color: #409EFF; border-radius: 3px; }
.empty-tip { text-align: center; color: #909399; padding: 16px 0; }
.empty-container { text-align: center; }
.empty-icon { font-size: 48px; margin-bottom: 12px; opacity: 0.6; }
.empty-text { font-size: 14px; color: #909399; }
.empty-abs { position: absolute; left: 0; right: 0; top: 48px; bottom: 0; display: flex; align-items: center; justify-content: center; }
</style> </style>