diff --git a/components.d.ts b/components.d.ts
index 1c57248a..cec5253a 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -9,14 +9,11 @@ export {}
declare module 'vue' {
export interface GlobalComponents {
ABadge: typeof import('ant-design-vue/es')['Badge']
- ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb']
ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
- ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
+ AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider']
ADrawer: typeof import('ant-design-vue/es')['Drawer']
AImage: typeof import('ant-design-vue/es')['Image']
AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
- AMenu: typeof import('ant-design-vue/es')['Menu']
- AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
AModal: typeof import('ant-design-vue/es')['Modal']
APagination: typeof import('ant-design-vue/es')['Pagination']
APopover: typeof import('ant-design-vue/es')['Popover']
@@ -24,16 +21,17 @@ declare module 'vue' {
ASelect: typeof import('ant-design-vue/es')['Select']
ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
ASlider: typeof import('ant-design-vue/es')['Slider']
- ASpace: typeof import('ant-design-vue/es')['Space']
ASpin: typeof import('ant-design-vue/es')['Spin']
- ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
ASwitch: typeof import('ant-design-vue/es')['Switch']
ATable: typeof import('ant-design-vue/es')['Table']
ATabPane: typeof import('ant-design-vue/es')['TabPane']
ATabs: typeof import('ant-design-vue/es')['Tabs']
- ATimeRangePicker: typeof import('ant-design-vue/es')['TimeRangePicker']
AUpload: typeof import('ant-design-vue/es')['Upload']
ElCascader: typeof import('element-plus/es')['ElCascader']
+ ElLoading: typeof import('element-plus/es')['ElLoading']
+ ElPagination: typeof import('element-plus/es')['ElPagination']
+ ElTable: typeof import('element-plus/es')['ElTable']
+ ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
}
diff --git a/src/component/Canvas/ExistsImageList/index.vue b/src/component/Canvas/ExistsImageList/index.vue
index 98113a14..2e6e2d3c 100644
--- a/src/component/Canvas/ExistsImageList/index.vue
+++ b/src/component/Canvas/ExistsImageList/index.vue
@@ -4,7 +4,7 @@
@@ -90,6 +92,12 @@ import { Modal,message,Upload,CascaderProps } from 'ant-design-vue';
import { ElCascader } from 'element-plus'
export default defineComponent({
+ props:{
+ isHistory:{
+ type:Boolean,
+ default:false
+ },
+ },
components:{
VueCropper,
ElCascader,
diff --git a/src/component/common/TableSearchBar.vue b/src/component/common/TableSearchBar.vue
new file mode 100644
index 00000000..00fc3884
--- /dev/null
+++ b/src/component/common/TableSearchBar.vue
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
diff --git a/src/component/home/design/tools.vue b/src/component/home/design/tools.vue
index ed81d79e..47aadcd2 100644
--- a/src/component/home/design/tools.vue
+++ b/src/component/home/design/tools.vue
@@ -295,6 +295,7 @@ export default defineComponent({
})
let obj = {
value:'mannquin',
+ // type:'Mannquin',
type:data.locale == "ENGLISH"?'Mannquin':'模特',
imgList:list
}
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index fd77a90b..48b9816a 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -351,8 +351,8 @@ export default {
CollectionsName: "名字",
source: "来源",
UptateTime: "修改时间",
- SketchCounts: "项目名字",
- Operations: "Operations",
+ SketchCounts: "草图数量",
+ Operations: "操作",
jsContent1: "删除成功",
jsContent2: "您确定要删除这个收藏吗?",
jsContent3: "修改成功",
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 4d739fd3..7c668651 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -353,7 +353,7 @@ export default {
CollectionsName: "Collections Name",
source: "Source",
UptateTime: "Uptate Time",
- SketchCounts: "Project Name",
+ SketchCounts: "SketchCounts",
Operations: "Operations",
jsContent1: "Deleted successfully",
jsContent2: "Do you really want to delete this collection? ",
diff --git a/src/tool/listData.js b/src/tool/listData.js
index 9eee715c..8d4d42fb 100644
--- a/src/tool/listData.js
+++ b/src/tool/listData.js
@@ -348,18 +348,24 @@ const navTypeList = (t)=>{
},
]
},
- history:{
+ // history:{
+ // icon:'fi-br-time-past',
+ // label:t('HistoryPage.History'),
+ // value:'history',
+ // Todaylist:[
+ // ],
+ // Yesterdaylist:[
+ // ],
+ // WithinAWeeklist:[
+ // ],
+ // Earlierlist:[
+ // ],
+ // },
+ history111:{
icon:'fi-br-time-past',
label:t('HistoryPage.History'),
- value:'history',
- Todaylist:[
- ],
- Yesterdaylist:[
- ],
- WithinAWeeklist:[
- ],
- Earlierlist:[
- ],
+ value:'history111',
+ router:'/home/history111'
},
gallery:{
icon:'fi-rr-gallery',
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index 7cfc18eb..3c36a07c 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -18,17 +18,17 @@
{{$t('Header.NewProject')}}