@@ -54,9 +55,11 @@ export default defineComponent({
}
},
},
+ emits:['update:modelValue'],
setup(props,{ emit }) {
let uploadedFile:Array
= [] ;
const {proxy} = getCurrentInstance();
+ const upFileRef = ref()
const dataParam = reactive({
token:getToken(),
})
@@ -73,7 +76,7 @@ export default defineComponent({
return value
},
set: val => {
- emit('upFileData', val)
+ emit('update:modelValue', val)
}
});
const beforeUpload: UploadProps['beforeUpload'] = () => {
@@ -130,6 +133,9 @@ export default defineComponent({
const handlePreview = (file:UploadUserFile)=>{
window.open(file.url)
}
+ const stopUpFile = ()=>{
+ upFileRef.value.abort()
+ }
return {
dataFileList,
handleSuccess,
@@ -139,6 +145,8 @@ export default defineComponent({
handleChange,
handleExceed,
handlePreview,
+ upFileRef,
+ stopUpFile,
dataParam
};
},
diff --git a/src/components/uploadImg/index.vue b/src/components/uploadImg/index.vue
index 4eaee21..14e6ca3 100644
--- a/src/components/uploadImg/index.vue
+++ b/src/components/uploadImg/index.vue
@@ -12,6 +12,7 @@
:on-exceed = "handleExceed"
:before-upload="beforeAvatarUpload"
:data="dataParam"
+ ref="upImageRef"
>
@@ -66,7 +67,9 @@ export default defineComponent({
}
},
},
+ emits:['update:modelValue'],
setup(props,{ emit }) {
+ const upImageRef = ref()
const baseURL:string|undefined|boolean = import.meta.env.VITE_API_URL
const {proxy} = getCurrentInstance();
const dialogImageUrl = ref('')
@@ -93,7 +96,7 @@ export default defineComponent({
return value
},
set: val => {
- emit('uploadData', val)
+ emit('update:modelValue', val)
}
});
@@ -144,7 +147,11 @@ export default defineComponent({
const setDataFileList = () => {
dataFileList.value = uploadedFile
};
+ const stopUpImage = ()=>{
+ upImageRef.value.abort()
+ }
return {
+ upImageRef,
dataFileList,
imageUrl,
baseURL,
@@ -155,6 +162,7 @@ export default defineComponent({
handleRemove,
handlePictureCardPreview,
handleAvatarSuccess,
+ stopUpImage,
dataParam
};
},
diff --git a/src/components/uploadSelector/index.vue b/src/components/uploadSelector/index.vue
new file mode 100644
index 0000000..84ba92f
--- /dev/null
+++ b/src/components/uploadSelector/index.vue
@@ -0,0 +1,400 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+ 上传文件
+
+
+ 上传图片
+
+
+ 上传大文件
+
+
+ 确认返回
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{getExt(scope.row.name)}}
+
+
+
+
+
+
+
+
+ {{ proxy.parseTime(scope.row.updatedAt, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+ 选择
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/layout/navBars/breadcrumb/userNews.vue b/src/layout/navBars/breadcrumb/userNews.vue
index 1cf01f4..17bfcad 100644
--- a/src/layout/navBars/breadcrumb/userNews.vue
+++ b/src/layout/navBars/breadcrumb/userNews.vue
@@ -152,8 +152,9 @@ const getData = (barName: number | undefined) => {
})*/
let noticeParam = {
pageNum: 1,
- pageSize: 5,
+ pageSize: 10,
type: barName,
+ isTrim:true
}
listShowNotice(noticeParam).then((res: any) => {
state.noticeList = res.data.list || []
@@ -225,12 +226,14 @@ const handleRead = (item: SysNoticeInfoData) => {
getData(item.type)
ElMessage.success("已读");
})
+ getUnReadCount()
}
diff --git a/src/views/bigUpload/index.vue b/src/views/bigUpload/index.vue
deleted file mode 100644
index 7a5ed9d..0000000
--- a/src/views/bigUpload/index.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
- 重置
-
-
-
-
-
- 文件上传
-
-
-
-
-
- 删除文件
-
-
-
-
-
-
-
-
-
- {{byteText(scope.row.size)}}
-
-
-
-
-
-
-
- 修改
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/bigUpload/tableData.ts b/src/views/bigUpload/tableData.ts
deleted file mode 100644
index 656ee59..0000000
--- a/src/views/bigUpload/tableData.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import {onMounted, reactive, ref} from "vue";
-import {getBigFileList as apiGetBigFileList} from "/@/api/system/bigFile";
-import {FormInstance} from "element-plus/es";
-
-export default function () {
- const tableData = ref([])
- let total = ref(0)
- const queryParams = reactive({
- pageNum: 1,
- pageSize: 10,
- name: '',
- orderBy:'created_at desc'
- })
- const queryRef = ref();
-
- const resetQuery = (formEl: FormInstance | undefined) => {
- if (!formEl) return
- formEl.resetFields()
- getBigFileList()
- }
-
-
- const getBigFileList = async () => {
- const result:any = await apiGetBigFileList(queryParams).then((res:any) => res.code === 0 ? res.data : {})
- tableData.value = Array.isArray(result.list) ? result.list : []
- total.value = result.total || 0
- }
-
- const resetBigFileList = async () => {
- queryParams.pageNum = 1
- queryParams.pageSize = 10
- queryParams.name = ''
- await getBigFileList()
- }
-
-
- onMounted(getBigFileList)
-
- return {
- total,
- queryParams,
- tableData,
- queryRef,
- resetQuery,
- getBigFileList,
- resetBigFileList
- }
-}
diff --git a/src/views/demo/map2.ts b/src/views/demo/map2.ts
deleted file mode 100644
index fcd7490..0000000
--- a/src/views/demo/map2.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import {defineComponent,h} from "vue";
-
-export default defineComponent({
- name:"baiduMap",
- props:{
- src:{
- type:String,
- default:'',
- }
- },
- setup(prop){
- return ()=>{
- return h('script',{src:prop.src,type:'text/javascript'})
- }
- },
-})
diff --git a/src/views/fun/ueditor/index.vue b/src/views/fun/ueditor/index.vue
index 09791cd..cb62be2 100644
--- a/src/views/fun/ueditor/index.vue
+++ b/src/views/fun/ueditor/index.vue
@@ -1,6 +1,6 @@
diff --git a/src/views/system/config/component/editConfig.vue b/src/views/system/config/component/editConfig.vue
index ea868bd..14f0eaf 100644
--- a/src/views/system/config/component/editConfig.vue
+++ b/src/views/system/config/component/editConfig.vue
@@ -16,7 +16,7 @@
{{dict.label}}
diff --git a/src/views/system/dept/component/editDept.vue b/src/views/system/dept/component/editDept.vue
index 525d0a5..141e125 100644
--- a/src/views/system/dept/component/editDept.vue
+++ b/src/views/system/dept/component/editDept.vue
@@ -27,15 +27,7 @@
-
- {{item.userNickname}}
-
-
- 请选择
+
@@ -68,13 +60,11 @@
-