diff --git a/src/api/task/task.ts b/src/api/task/task.ts index 09a328d..36418ac 100644 --- a/src/api/task/task.ts +++ b/src/api/task/task.ts @@ -33,3 +33,31 @@ export async function audit(params: ApprovalParam) { headers: { 'Content-Type': ContentTypeEnum.FORM_DATA }, }) } + +/** + * 移动到可疑文件夹 + * @returns + */ +export async function dubiousfileyd(params) { + const res = await http.request({ + url: `/ocr/dubiousfile/dubiousfileyd`, + method: 'get', + params, + }) + + return res +} + +/** + * 显示可疑文件夹列表 + * @returns + */ +export async function dubiousfilelist(params) { + const res = await http.request({ + url: `/ocr/dubiousfile/dubiousfilelist`, + method: 'get', + params, + }) + + return res +} diff --git a/src/api/work/work.ts b/src/api/work/work.ts index 819c9db..725cf88 100644 --- a/src/api/work/work.ts +++ b/src/api/work/work.ts @@ -147,3 +147,29 @@ export async function sort(id: string): Promise { params: { packageid: id }, }) } + +/** + * 将任务包内的任务按相似度排序 + * @param id + * @returns + */ +export async function toolsCount(id: string): Promise { + return await http.request({ + url: `/ocr/aitools/toolsCount`, + method: 'get', + params: { packageid: id }, + }) +} + +/** + * ai审批工具 + * @param id + * @returns + */ +export async function aiApprovaltools(params): Promise { + return await http.request({ + url: `/ocr/aitools/aiApprovaltools`, + method: 'get', + params, + }) +} diff --git a/src/assets/icons/hasmessage.svg b/src/assets/icons/hasmessage.svg new file mode 100644 index 0000000..8dac7f6 --- /dev/null +++ b/src/assets/icons/hasmessage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/nomessage.svg b/src/assets/icons/nomessage.svg new file mode 100644 index 0000000..49fdfe0 --- /dev/null +++ b/src/assets/icons/nomessage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/RichEditor/Quill.vue b/src/components/RichEditor/Quill.vue index 9dcb417..36a416f 100644 --- a/src/components/RichEditor/Quill.vue +++ b/src/components/RichEditor/Quill.vue @@ -9,8 +9,8 @@ const quillEditor = ref() const cardStyle = { 'width': '500px', - '--n-padding-bottom': '10px', - '--n-padding-left': '10px', + '--n-padding-bottom': '17px', + '--n-padding-left': '24px', } const note = ref('

sss

') @@ -23,7 +23,7 @@ const options = reactive({ ], }, theme: 'snow', - placeholder: 'placaholder', + placeholder: '', }) function initHandler() { @@ -44,7 +44,7 @@ const saveHandler = debounce(() => { diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue index b583323..3d43655 100644 --- a/src/layout/components/Header/RecycleModal.vue +++ b/src/layout/components/Header/RecycleModal.vue @@ -7,6 +7,8 @@ import imagesloaded from 'imagesloaded' import { randomInt } from '@/utils/index' import { timeOptions, viewOptions } from '@/config/home' import { getPictureList } from '@/api/home/main' +import { dubiousfilelist } from '@/api/task/task' + import { off, on } from '@/utils/domUtils' import img1 from '@/assets/images/1.jpg' import img2 from '@/assets/images/2.jpg' @@ -97,7 +99,7 @@ function randomUrl() { async function featchList() { loading = true try { - const result = await getPictureList({ ...pagination, search_month: '', search_history: '0' }) + const result = await dubiousfilelist({ ...pagination, search_month: '', search_history: '0' }) // TODO：测试数据 result.data = Array.from({ length: 30 }) result.pageCount = 1 @@ -132,6 +134,7 @@ onUpdated(() => { }) onBeforeMount(async () => { + console.log(888) const list = await featchList() listData.value = list }) @@ -227,6 +230,7 @@ function afterLeave() { } onMounted(() => { + console.log(789) show.value && addListeners() }) @@ -299,10 +303,15 @@ function onCheckChange(val: any, item: any) { v-for="(item, index) in listData" :key="index" :data-id="index" :class="{ 'grid-item-selected': isSelected(index) }" :style="{ height: gridHeight }" class="grid-item" > - + > --> + diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue index 1539179..c66a6c7 100644 --- a/src/layout/components/Header/index.vue +++ b/src/layout/components/Header/index.vue @@ -7,6 +7,7 @@ import RecycleModal from './RecycleModal.vue' import SearchModal from './SearchModal.vue' import ShortcutModal from './ShortcutModal.vue' import UserSettings from './UserSettings.vue' +import { getMessageList } from '@/api/message/message' import { getImgUrl } from '@/utils/urlUtils' import { useUser } from '@/store/modules/user' @@ -45,6 +46,29 @@ export default defineComponent({ const router = useRouter() const route = useRoute() const routename = ref(route.meta.title) + // 图标列表mm + const iconList = ref([ + { + icon: 'magnifying-1', + handle: searchHandler, + }, + { + icon: 'shortcut-keys', + handle: shortcutHandler, + }, + { + icon: 'suspicious-folder', + handle: recycleHandler, + }, + { + icon: 'memo', + handle: quillHandler, + }, + { + icon: 'nomessage', + handle: goMessage, + }, + ]) watch( () => route.fullPath, @@ -53,6 +77,10 @@ export default defineComponent({ }, ) + const handleDragOver = (event) => { + event.dataTransfer.dropEffect = 'move' + } + const dropdownSelect = (key) => { router.push({ name: key }) } @@ -110,6 +138,18 @@ export default defineComponent({ router.push({ name: 'message-main' }) } + async function getMessage() { + const res = await getMessageList({ page: 1, size: 10, msgCategory: 1 }) + if (res.data) + iconList.value[4].icon = 'hasmessage' + else + iconList.value[4].icon = 'nomessage' + } + + setInterval(() => { + getMessage() + }, 5000) + const mousetrap = inject('mousetrap') as any onMounted(() => { mousetrap.bind('n r', quillHandler) @@ -118,30 +158,6 @@ export default defineComponent({ mousetrap.bind('m m', searchHandler) }) - // 图标列表mm - const iconList = [ - { - icon: 'magnifying-1', - handle: searchHandler, - }, - { - icon: 'shortcut-keys', - handle: shortcutHandler, - }, - { - icon: 'suspicious-folder', - handle: recycleHandler, - }, - { - icon: 'memo', - handle: quillHandler, - }, - { - icon: 'newmessage', - handle: goMessage, - }, - ] - return { ...toRefs(state), iconList, @@ -158,6 +174,7 @@ export default defineComponent({ recycleHandler, useInfo, getImgUrl, + getMessage, } }, }) @@ -182,6 +199,7 @@ export default defineComponent({ v-for="item in iconList" :key="item.icon" class="layout-header-trigger layout-header-trigger-min" + @dragover.prevent="handleDragOver" >
diff --git a/src/views/message/content/Detail.vue b/src/views/message/content/Detail.vue index dc0f471..1510e3b 100644 --- a/src/views/message/content/Detail.vue +++ b/src/views/message/content/Detail.vue @@ -66,7 +66,7 @@ getDetail() 发布时间：
- {{ format(detail.sendTime * 1000, 'yyyy-MM-dd HH:mm:ss') }} + {{ format(detail.sendTime, 'yyyy-MM-dd HH:mm:ss') }}
diff --git a/src/views/message/content/List.vue b/src/views/message/content/List.vue index a13bace..6358f09 100644 --- a/src/views/message/content/List.vue +++ b/src/views/message/content/List.vue @@ -134,31 +134,35 @@ function getMore() {
- {{ format(item.sendTime * 1000, 'dd') }} + {{ format(item.sendTime, 'dd') }}
- {{ format(item.sendTime * 1000, 'yyyy-MM') }} + {{ format(item.sendTime, 'yyyy-MM') }}
- {{ `<任务ID：${item.tag.nbus_id}>` }}{{ item.tag.task_name }} + {{ `<任务ID：${item.tag.taskId}>` }}{{ item.tag.taskName }}
{{ item.titile }}
- 审批节点： + 审批节点：{{ item.tag.nodeName }}
-
- 审批状态：{{ item.tag.nbug_status }} +
+ 审批状态：{{ item.tag.states }}
-
+
+ {{ item.tag.sendUserName }} + {{ format(item.sendTime, 'yyyy-MM-dd HH:mm:ss') }} +
+
{{ item.userName }} - {{ format(item.sendTime * 1000, 'yyyy-MM-dd HH:mm:ss') }} + {{ format(item.sendTime, 'yyyy-MM-dd HH:mm:ss') }}