Merge branch 'cheney' into dev

components.d.ts

@@ -23,7 +23,6 @@ declare module 'vue' {
     ManyToMany: typeof import('./src/components/manyToMany/index.vue')['default']
     NoticeBar: typeof import('./src/components/noticeBar/index.vue')['default']
     PermissionButton: typeof import('./src/components/PermissionButton/index.vue')['default']
-    ProgressBar: typeof import('./src/components/ProgressBar/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SvgIcon: typeof import('./src/components/svgIcon/index.vue')['default']

src/views/product-manage/competitor-monitor/index.vue

@@ -12,10 +12,9 @@ import * as api from './api';
 import { useTemplateRef } from 'vue';
 import { DictionaryStore } from '/@/stores/dictionary';
 import { useCustomHeight } from '/@/utils/useCustomHeight';
+import DataTable from './component/DataTable.vue';
 
 
-const DataTable = defineAsyncComponent(() => import('./component/DataTable.vue'));
-
 defineOptions({
   name: 'CompetitorMonitor'
 });

src/views/product-manage/product-list/index.vue

@@ -12,10 +12,9 @@ import { useResponse } from '/@/utils/useResponse';
 import { useTemplateRef } from 'vue';
 import * as api from './api';
 import { useCustomHeight } from '/@/utils/useCustomHeight';
+import DataTable from './component/DataTable.vue';
 
 
-const DataTable = defineAsyncComponent(() => import('./component/DataTable.vue'));
-
 defineOptions({
   name: 'ProductList'
 });
@@ -169,7 +168,7 @@ async function resetParameter() {
           <el-button :icon="Search" :loading="btnLoading" class="mb-4" type="primary" @click="handleQuery">
             查 询
           </el-button>
-          <el-button :icon="RefreshLeft" :loading="resetLoading" color="#ECECF1C9" style="width: 88px; color: #3c3c3c;" 
+          <el-button :icon="RefreshLeft" :loading="resetLoading" color="#ECECF1C9" style="width: 88px; color: #3c3c3c;"
                      @click="resetParameter">
             重 置
           </el-button>

src/views/product-manage/product-monitor/index.vue

@@ -12,10 +12,9 @@ import * as api from './api';
 import { useTemplateRef } from 'vue';
 import { DictionaryStore } from '/@/stores/dictionary';
 import { useCustomHeight } from '/@/utils/useCustomHeight';
+import DataTable from './component/DataTable.vue';
 
 
-const DataTable = defineAsyncComponent(() => import('./component/DataTable.vue'));
-
 defineOptions({
   name: 'ProductMonitor'
 });
@@ -197,7 +196,7 @@ async function resetParameter() {
           <el-button :icon="Search" :loading="btnLoading" class="mb-4" type="primary" @click="handleQuery">
             查 询
           </el-button>
-          <el-button :icon="RefreshLeft" :loading="resetLoading" color="#ECECF1C9" style="width: 88px; color: #3c3c3c;" 
+          <el-button :icon="RefreshLeft" :loading="resetLoading" color="#ECECF1C9" style="width: 88px; color: #3c3c3c;"
                      @click="resetParameter">
             重 置
           </el-button>