guoxiangbin
/
ocr-web
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request 'fix:样式修改' (#329) from fix/change_task into test

Browse Source 
Reviewed-on: #329
pull/331/head
yaoshuli 1 year ago
parent 72f1a8be9a 04de2e0557
commit 46e15489f7
11 changed files with 159 additions and 52 deletions
Show Stats Download Patch File Download Diff File

4
index.html
Unescape View File

@ -11,8 +11,8 @@
<link href="/favicon.ico" rel="icon"/>
<title><%= title %></title>
</head>
<body>
<div id="appProvider" style="display: none"></div>
<body style="overflow: hidden;">
<div id="appProvider" style="display: none;"></div>
<div id="app">
<style>
.first-loading-wrap {

15
src/layout/components/Header/RecycleModal.vue
Unescape View File

@ -9,6 +9,7 @@ import { cloneDeep, debounce } from 'lodash-es'
import ConfrimModal from './ConfrimModal.vue'
import { audit, dubiousfilelist, removeFiles } from '@/api/task/task'
import { viewOptions } from '@/config/home'
import TishiDialog from "@/views/home/aside/comp/modals/TiShi.vue"
import NotPassed from '@/components/Approval/NotPassed.vue'
import { formatToDateHMS } from '@/utils/dateUtil'
@ -19,7 +20,8 @@ const cardStyle = {
'--n-padding-bottom': '40px',
'--n-padding-left': '120px',
}
const tishiref=ref()
const paramasref=ref()
const bgLoadingImg = ref(bgLoading)
let startTime = 0
let endTime = 0
@ -587,7 +589,9 @@ function approvalHandler(items?: any) {
flowTaskInfoList: list,
}
dialog.info({
tishiref.value.showModalx()
paramasref.value=param
/* dialog.info({
title: '确认提示',
content: '确认给该任务审批为【通过】吗?',
positiveText: '确定',
@ -596,9 +600,11 @@ function approvalHandler(items?: any) {
doAudit(param)
},
onNegativeClick: () => { },
})
})*/
}
function tishiok(){
doAudit( paramasref.value)
}
function doAudit(param: any) {
audit(param).then((res) => {
const { code } = res
@ -687,6 +693,7 @@ watch(() => show.value, async (newVal) => {
<template>
<div>
<TishiDialog ref="tishiref" :label="'确认给该任务审批为【通过】吗?'" @tishiok="tishiok"/>
<n-modal
v-model:show="show" :mask-closable="false" style="position: relative;" transform-origin="center"
@after-enter="afterEnter" @after-leave="afterLeave"

28
src/layout/components/Header/index.vue
Unescape View File

@ -23,6 +23,8 @@ import { useUser } from '@/store/modules/user'
import { useTaskStore } from '@/store/modules/task'
import defaultAvatar from '@/assets/icons/avatar.svg'
import { useKeydown } from '@/hooks/event/useKeydown'
import TishiDialog from "@/views/home/aside/comp/modals/TiShi.vue"
const taskStore = useTaskStore()
export default defineComponent({
@ -103,9 +105,28 @@ export default defineComponent({
router.push({ name: key })
}
const ModalRef=ref(null)
const paramasref=ref(null)
const tishiok=()=>{
userStore.logout().then(() => {
message.success('成功退出登录')
router
.replace({
name: 'Login',
query: {
// redirect: route.fullPath,
},
})
.finally(() => location.reload())
})
}
// 退出登录
const doLogout = () => {
dialog.warning({
console.log(ModalRef.value)
//const modal3 = unref(tishiref)! as any
// console.log(modal3)
//modal3.showModalx()
dialog.warning({
title: '确认提示',
content: '您确定要退出登录吗',
positiveText: '取消',
@ -201,6 +222,9 @@ onUnmounted(() => {
const defaultAvatarSrc = ref(defaultAvatar)
return {
ModalRef,
paramasref,
tishiok,
...toRefs(state),
iconList,
doLogout,
@ -227,6 +251,7 @@ onUnmounted(() => {
<template>
<div class="layout-header">
<!-- 左侧菜单 -->
<div class="layout-header-left">
<!-- 菜单收起 -->
@ -276,6 +301,7 @@ onUnmounted(() => {
<QuillModal ref="quillModalRef" />
<ShortcutModal ref="shortcutModal" />
<SearchModal ref="SearchModalRef" />
<TishiDialog ref="ModalRef" :label="'您确定要退出登录吗'" @tishiok="tishiok"/>
</template>
<style lang="less" scoped>

24
src/views/final/comp/RepeatTaskTableModal.vue
Unescape View File

@ -27,6 +27,7 @@ import { formatToDateHMS } from '@/utils/dateUtil'
import { audit } from '@/api/task/task'
import NotPassed from '@/components/Approval/NotPassed.vue'
import { useDataHeaderStore } from '@/store/modules/DataHeader'
import TishiDialog from "@/views/home/aside/comp/modals/TiShi.vue"
const emit = defineEmits<{
(e: 'commit', columns: any[])
@ -52,7 +53,8 @@ async function handleSumbit(e: MouseEvent) {
e.preventDefault()
closeModal()
}
const tishiref=ref()
const paramasref=ref()
const columns: DataTableColumns<RowData> = [
{
type: 'selection',
@ -321,7 +323,9 @@ function batchReject() {
// 审核通过
function doAudit(param: any) {
dialog.info({
tishiref.value.showModalx()
paramasref.value=param
/* dialog.info({
title: '确认提示',
content: '确认给该任务审批为【通过】吗?',
positiveText: '确定',
@ -338,9 +342,19 @@ function doAudit(param: any) {
})
},
onNegativeClick: () => {},
})
})*/
}
function tishiok(){
audit(paramasref.value).then((res) => {
const { code } = res
if (code === 'OK') {
message.success(res.message)
reload()
haeaderstore.setDataConfig(true)
}
else { message.error(res.message) }
})
}
// 审核不通过
function rejectHandler(list) {
const msg = validate(list)
@ -387,7 +401,7 @@ defineExpose({
<template>
<div>
<NotPassed ref="notPassModalRef" @success="reload" />
<TishiDialog ref="tishiref" :label="'确认给该任务审批为【通过】吗?'" @tishiok="tishiok"/>
<n-modal v-model:show="show" transform-origin="center">
<n-card
class="cardstyle"

28
src/views/final/content/Content.vue
Unescape View File

@ -49,6 +49,7 @@ import { formatToDateHMS } from '@/utils/dateUtil'
import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
import DataHeader from '@/components/DataHeader/index.vue'
import { useDataHeaderStore } from '@/store/modules/DataHeader'
import TishiDialog from "@/views/home/aside/comp/modals/TiShi.vue"
const props = defineProps({
@ -61,6 +62,8 @@ const emit = defineEmits(['changeShow','goDetailx'])
function changeContent() {
emit('changeShow')
}
const tishiref=ref()
const paramasref=ref()
const headerref = ref(null)
const checkedRowKeys = ref([])
const dicStore = useDictionary()
@ -718,8 +721,10 @@ function rejectHandler(list) {
// 审核通过
function doAudit(param: any) {
const modal = unref(headerref)! as any
dialog.info({
tishiref.value.showModalx()
paramasref.value=param
/* const modal = unref(headerref)! as any
dialog.info({
title: '确认提示',
content: '确认给该任务审批为【通过】吗?',
positiveText: '确定',
@ -739,9 +744,23 @@ function doAudit(param: any) {
})
},
onNegativeClick: () => {},
})
})*/
}
function tishiok(){
const modal = unref(headerref)! as any
audit(paramasref.value).then((res) => {
const { code } = res
if (code === 'OK') {
message.success(res.message)
reload()
modal.getData()
// haeaderstore.setDataConfig(true)
}
else {
message.error(res.message)
}
})
}
function switchBatch() {
selectionIds.value = []
checkedRowKeys.value = []
@ -862,6 +881,7 @@ defineExpose({
<template>
<div class="wrapper">
<TishiDialog ref="tishiref" :label="'确认给该任务审批为【通过】吗?'" @tishiok="tishiok"/>
<div class="wrapper-header">
<div class="wrapper-header-left">
<span class="wrapper-header-font">任务管理列表</span>

24
src/views/final/content/ListContent.vue
Unescape View File

@ -15,6 +15,7 @@ import DataHeader from '@/components/DataHeader/index.vue'
import NotPassed from '@/components/Approval/NotPassed.vue'
import { useDataHeaderStore } from '@/store/modules/DataHeader'
import { el } from 'date-fns/locale'
import TishiDialog from "@/views/home/aside/comp/modals/TiShi.vue"
const props = defineProps({
@ -28,6 +29,8 @@ const props = defineProps({
}
})
const emit = defineEmits(['changeShow','goDetailx'])
const tishiref=ref()
const paramasref=ref()
const aa = ref(true)
const haeaderstore = useDataHeaderStore()
const headerref = ref(null)
@ -317,15 +320,13 @@ function actionHandler(action: any, row: any) {
}
// 审核通过
function doAudit(param: any, row: any) {
const modal = unref(headerref)! as any
tishiref.value.showModalx()
paramasref.value=param
dialog.info({
title: '确认提示',
content: '确认给该任务审批为【通过】吗?',
positiveText: '确定',
negativeText: '取消',
onPositiveClick: () => {
audit(param).then((res) => {
}
function tishiok(){
const modal = unref(headerref)! as any
audit(paramasref.value).then((res) => {
const { code } = res
if (code === 'OK') {
message.success(res.message)
@ -341,12 +342,6 @@ function doAudit(param: any, row: any) {
selectionIds.value = []
}
})
// alert("X")
// haeaderstore.setDataConfig(true)
},
onNegativeClick: () => {},
})
}
// 单个审批通过
function singleApproval(row) {
@ -558,6 +553,7 @@ defineExpose({
<template>
<div class="wrapper">
<TishiDialog ref="tishiref" :label="'确认给该任务审批为【通过】吗?'" @tishiok="tishiok"/>
<div class="wrapper-header">
<div class="wrapper-header-left">
<span class="wrapper-header-font">任务管理列表</span>

11
src/views/home/aside/comp/modals/TiShi.vue
Unescape View File

@ -19,14 +19,9 @@ const showx = ref(false)
const label=ref(props.label)
const toolsData = ref({} as any)
async function getData() {
const res = await getToolsCount()
toolsData.value = res.data || {}
if (res.code == 'OK')
showModalx()
}
onMounted(() => {
getData()
})
function showModalx() {
@ -38,6 +33,7 @@ function closeModal() {
}
function onok(){
emit('tishiok')
showx.value = false
}
async function reject() {
emit('reject', { a: 'todo' })
@ -59,6 +55,7 @@ defineExpose({
<template>
<n-modal v-model:show="showx" transform-origin="center" class="modal_wrap">
<div>
<div class="title"> <SvgIcon size="21" class="icon" style="margin-right:17.5px" name="warn" @click="closeModal" />确认提示</div>
<div class="content">{{label}}</div>
<div class="footer">

3
src/views/task/aside/Aside.vue
Unescape View File

@ -399,6 +399,9 @@ function handleOk(item: any) {
right: -20px;
z-index: 10;
}
}
::v-deep(.aside-header){
padding-bottom: 47px !important;
}
::v-deep(.list){
height: calc(100vh - 218px);

19
src/views/task/content/Content.vue
Unescape View File

@ -24,12 +24,14 @@ import { getAllfieldList, getfieldList } from '@/api/home/filter'
import { TASK_STATUS_OBJ } from '@/enums/index'
import { useFinal } from '@/store/modules/final'
import { useDataHeaderStore } from '@/store/modules/DataHeader'
import TishiDialog from "@/views/home/aside/comp/modals/TiShi.vue"
import { EllipsisHorizontal, EyeOutline as EyeOutlineIcon } from '@vicons/ionicons5'
import {
audit,
dubiousfileyd,
getSimilarityList,
getTaskDetailInfo,
} from '@/api/task/task'
import { useTask } from '@/store/modules/task'
import { useUser } from '@/store/modules/user'
@ -44,6 +46,7 @@ import type { Component } from 'vue'
import { NIcon, } from 'naive-ui'
import { Download as DownloadIcon, Upload as UploadIcon } from '@vicons/tabler'
const props = defineProps({
@ -52,7 +55,8 @@ const props = defineProps({
default:{}
}
})
const tishiref=ref()
const paramasref=ref()
const emit = defineEmits(['setAsideItemName','goBack'])
const timer = ref()
const HeaderStore = useDataHeaderStore()
@ -306,8 +310,9 @@ function approvalHandler(items?: any) {
failCauseName: '',
flowTaskInfoList: list,
}
dialog.info({
tishiref.value.showModalx()
paramasref.value=param
/* dialog.info({
title: '确认提示',
content: '确认给该任务审批为【通过】吗?',
positiveText: '确定',
@ -319,9 +324,12 @@ function approvalHandler(items?: any) {
onNegativeClick: () => {
overTask.value = null
},
})
})*/
}
function tishiok(){
doAudit(paramasref.value)
overTask.value = null
}
function singleRejectHandlex(item?: any) {
const modal = unref(notPassModalRef)! as any
@ -1397,6 +1405,7 @@ function cancel() {
<CustomSettingModal ref="CustomSettingModalRef" @on-ok="getDetail" />
<ImgDetailModal ref="imgdetailref" @passfun="passfun" @nopassfun="nopassfun" />
<MapModal ref="MapModalRef" />
<TishiDialog ref="tishiref" :label="'确认给该任务审批为【通过】吗?'" @tishiok="tishiok"/>
</div>
</template>

15
src/views/worksheet/aside/ListItem.vue
Unescape View File

@ -3,6 +3,7 @@ import { format } from 'date-fns'
import { computed, onMounted, ref, watch } from 'vue'
import type { PackageListItem } from '/#/workorder'
import { useDialog } from 'naive-ui'
import TishiDialog from "@/views/home/aside/comp/modals/TiShi.vue"
defineOptions({ name: 'ListItem' })
const props = defineProps({
@ -27,6 +28,8 @@ const props = defineProps({
default: () => {},
},
})
const tishiref=ref()
const paramasref=ref()
const emit = defineEmits(['dismisClick'])
const dialog = useDialog()
const svgName = computed(() => {
@ -37,7 +40,7 @@ const popconfirmTarget: any = ref(null)
const popconfirmRef: any = ref(null)
function handleDismissTask() {
dialog.warning({
/* dialog.warning({
title: '确认提示',
content: '确认解散该任务包吗？',
positiveText: '取消',
@ -53,10 +56,14 @@ function handleDismissTask() {
onNegativeClick: () => {
emit('dismisClick', props.mouseOverTask.id)
},
})
})*/
tishiref.value.showModalx()
popconfirmRef.value[0]?.setShow(false) // 关闭 popconfirm
}
function tishiok(){
emit('dismisClick', props.mouseOverTask.id)
}
onMounted(async () => {})
</script>
@ -68,7 +75,7 @@ onMounted(async () => {})
'list-item-selected': selected,
'h200': showFieldList?.length > 5 && !showFull,
}"
>
> <TishiDialog ref="tishiref" :label="'确认解散该任务包吗？'" @tishiok="tishiok"/>
<div v-for="(item, index) in showFieldList" :key="index">
<div v-if="item.id === 'name'" class="list-item-header">
<div class="id-wrap">

40
src/views/worksheet/content/Content.vue
Unescape View File

@ -32,7 +32,12 @@ import { useKeydown } from '@/hooks/event/useKeydown'
import { useDataHeaderStore } from '@/store/modules/DataHeader'
import CheckingTaskModal from '@/views/home/content/modal/CheckingTaskModal.vue'
import { getCheckDuplicateStatus, getCheckDuplicateStatusx, getLastCheckNox, removeCheckDuplicate } from '@/api/home/main'
import TishiDialog from "@/views/home/aside/comp/modals/TiShi.vue"
const tishiref=ref()
const tishireftwo=ref()
const paramasreftwo=ref()
const paramasref=ref()
const batch = ref(false) // 批量审批状态
const selectItems = ref<any[]>([])
const message = useMessage()
@ -504,8 +509,10 @@ function handleApproveMainImage(items?: any) {
failCauseName: '',
flowTaskInfoList: list,
}
tishireftwo.value.showModalx()
passDialog.value = true
dialog.info({
paramasreftwo.value=param
/*dialog.info({
title: '确认提示',
content: '确认给该任务审批为【通过】吗?',
positiveText: '确定',
@ -527,7 +534,22 @@ function handleApproveMainImage(items?: any) {
onNegativeClick: () => {
passDialog.value = false
},
})
})*/
}
function tishioktwo(){
passDialog.value = false
audit(paramasreftwo).then(async (res) => {
const { code } = res
if (code === 'OK') {
message.info(res.message)
const packageid = workStore.getActiveId
taskDetailInfo.value = await getTaskDetailInfo(packageid)
}
else {
message.error(res.message)
}
})
}
function approvalHandler(items?: any) {
let cloneItem: any
@ -567,8 +589,9 @@ function approvalHandler(items?: any) {
failCauseName: '',
flowTaskInfoList: list,
}
dialog.info({
tishiref.value.showModalx()
paramasref.value=param
/*dialog.info({
title: '确认提示',
content: '确认给该任务审批为【通过】吗?',
positiveText: '确定',
@ -577,9 +600,12 @@ function approvalHandler(items?: any) {
doAudit(param)
},
onNegativeClick: () => {},
})
})*/
}
function tishiok(){
doAudit(paramasref.value)
}
function doAudit(param: any) {
audit(param).then((res) => {
const { code } = res
@ -1036,6 +1062,8 @@ defineExpose({
@show="onRejectDialog"
@success="reloadDetailInfo"
/>
<TishiDialog ref="tishiref" :label="'确认给该任务审批为【通过】吗?'" @tishiok="tishiok"/>
<TishiDialog ref="tishireftwo" :label="'确认给该任务审批为【通过】吗?'" @tishiok="tishioktwo"/>
</div>
</template>

Write Preview
Loading…
Cancel
Save