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

fix:不通过弹框问题 图标修改 沉浸模式样式调整

Browse Source
pull/336/head
lihui_ocr 1 year ago
parent cd59b4cb4e
commit f3be642c1a
9 changed files with 71 additions and 34 deletions
Show Stats Download Patch File Download Diff File

4
patches/naive-ui+2.38.1.patch
Unescape View File

@ -21,7 +21,7 @@ index 3aacec9..a63ab54 100644
- }, feedbackNodes) : mergedValidationStatus === 'success' ? h("div", {
+ class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error flex`
+ }, [h('img', {
+ style: { width: '1rem', height: '1rem' },
+ style: { width: '0rem', height: '0rem' },
+ src: 'notice.svg'
+ }), feedbackNodes]) : mergedValidationStatus === 'success' ? h("div", {
key: "controlled-success",
@ -179,7 +179,7 @@ index 4f47aad..6dae078 100644
const feedbackNodes = children || feedback ? ((0, vue_1.h)("div", { key: "__feedback__", class: `${mergedClsPrefix}-form-item-feedback__line` }, children || feedback)) : this.renderExplains.length ? ((_a = this.renderExplains) === null || _a === void 0 ? void 0 : _a.map(({ key, render }) => ((0, vue_1.h)("div", { key: key, class: `${mergedClsPrefix}-form-item-feedback__line` }, render())))) : null;
- return feedbackNodes ? (mergedValidationStatus === 'warning' ? ((0, vue_1.h)("div", { key: "controlled-warning", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--warning` }, feedbackNodes)) : mergedValidationStatus === 'error' ? ((0, vue_1.h)("div", { key: "controlled-error", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error` }, feedbackNodes)) : mergedValidationStatus === 'success' ? ((0, vue_1.h)("div", { key: "controlled-success", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success` }, feedbackNodes)) : ((0, vue_1.h)("div", { key: "controlled-default", class: `${mergedClsPrefix}-form-item-feedback` }, feedbackNodes))) : null;
+ return feedbackNodes ? (mergedValidationStatus === 'warning' ? ((0, vue_1.h)("div", { key: "controlled-warning", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--warning` }, feedbackNodes)) : mergedValidationStatus === 'error' ? ((0, vue_1.h)("div", { key: "controlled-error", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error flex` }, [h('img', {
+ style: { width: '1rem', height: '1rem' },src: 'notice.svg'
+ style: { width: '0rem', height: '0rem' },src: 'notice.svg'
+ }), feedbackNodes])) : mergedValidationStatus === 'success' ? ((0, vue_1.h)("div", { key: "controlled-success", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success` }, feedbackNodes)) : ((0, vue_1.h)("div", { key: "controlled-default", class: `${mergedClsPrefix}-form-item-feedback` }, feedbackNodes))) : null;
});
}

24
src/components/Approval/NotPassed.vue
Unescape View File

@ -4,6 +4,7 @@ import { useMessage } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { audit } from '@/api/task/task'
const emit = defineEmits(['success', 'close', 'show'])
const message = useMessage()
const loading = ref(false)
@ -40,9 +41,7 @@ function closeModal() {
show.value = false
emit('close')
formData.disposeTypeId = '262403670085013522'
formData.failCauseId = '260402999231251188'
formData.comment = ''
}
defineExpose({
@ -50,6 +49,11 @@ defineExpose({
closeModal,
})
watch(show, (value) => {
if(value){
formData.disposeTypeId = '262403670085013522'
formData.failCauseId = '260402999231251188'
formData.comment = ''
}
// console.log(value)
emit('show', value)
})
@ -85,13 +89,21 @@ async function handleSumbit(e: MouseEvent) {
if (!errors) {
try {
const list: any = []
if( Array.isArray(state.idItemList) ){
state.idItemList.forEach((item) => {
list.push({
formId: item.id,
taskId: item.taskId,
taskName: item.fromTaskName,
})
})}else{
list.push({
formId: state.idItemList.id,
taskId: state.idItemList.taskId,
taskName: state.idItemList.fromTaskName,
})
}
const disposeTypeItem = disposeOptions.value.find(
item => item.value === formData.disposeTypeId,
)
@ -126,9 +138,7 @@ async function handleSumbit(e: MouseEvent) {
}
}
})
formData.disposeTypeId = '262403670085013522'
formData.failCauseId = '260402999231251188'
formData.comment = ''
}
async function selectChange(id) {
@ -196,7 +206,7 @@ async function selectChange(id) {
</template>
</n-select>
</n-form-item>
<n-form-item v-show="showOther" class="form-item-area" label="" path="">
<n-form-item v-if="showOther" class="form-item-area" label="" path="">
<n-input
v-model:value="formData.comment"
placeholder-class="pl"

5
src/views/final/comp/NewFilterModal.vue
Unescape View File

@ -172,10 +172,7 @@ const operatorOptions = [
label: '等于',
value: 'eq',
},
{
label: '不等于',
value: 'notEq',
},
]
const logicOptions = ref([])

6
src/views/home/aside/Aside.vue
Unescape View File

@ -100,8 +100,14 @@ function computeSlideHeight() {
useWindowSizeFn(computeSlideHeight, 280)
onBeforeMount(async () => {
console.log(configStore)
if(typeof configStore.fetchConfig === 'function'){
configStore.fetchConfig()
configStore.fetchCustomConfig()
}else{
location.reload();
}
})
nextTick(() => {

5
src/views/home/aside/comp/modals/NewFilterModal.vue
Unescape View File

@ -180,10 +180,7 @@ const operatorOptions = [
label: '等于',
value: 'eq',
},
{
label: '不等于',
value: 'notEq',
},
]
const logicOptions = ref([])

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

@ -55,6 +55,7 @@ const props = defineProps({
default:{}
}
})
const huadong=ref(false)
const tishiref=ref()
const paramasref=ref()
const emit = defineEmits(['setAsideItemName','goBack'])
@ -761,6 +762,14 @@ function cancel() {
})
}
}
function handleMouseEnter(){
console.log(true)
huadong.value=true
}
function handleMouseLeave(){
huadong.value=false
}
</script>
<template>
@ -1047,6 +1056,8 @@ function cancel() {
<div class="leftback" />
</div>
<div
@mouseenter="handleMouseEnter"
@mouseleave="handleMouseLeave"
v-show="imgbigshow"
class="right"
:style="
@ -1055,7 +1066,7 @@ function cancel() {
flex: 0.3,
// flex: 0,
//width: '30vw',
borderLeft: '2px solid #507AFD',
borderLeft:huadong? '2px solid #507AFD':'2px solid #fff',
position: 'relative',
borderRadius: 0,
height: '596px',
@ -1064,7 +1075,7 @@ function cancel() {
"
>
<div
v-show="isFullScreen"
v-show="isFullScreen&&imgbigshow==false?true:isFullScreen&&huadong?true:false"
class="aside-collapse-btn"
:style="{
position: 'absolute',

4
src/views/task/modal/ConfrimModal.vue
Unescape View File

@ -45,10 +45,12 @@ const comomitValue = computed(() => {
})
async function handleSumbit(e: MouseEvent) {
e.preventDefault()
closeModal()
e.preventDefault()
// selectRejectId.value === 'other'
emit('commit', unref(comomitValue), unref(selectBackId), showOther.value)
}
onBeforeMount(async () => {

5
src/views/task/modal/NewFilterModal.vue
Unescape View File

@ -171,10 +171,7 @@ const operatorOptions = [
label: '等于',
value: 'eq',
},
{
label: '不等于',
value: 'notEq',
},
]
const logicOptions = ref([])

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

@ -88,6 +88,7 @@ const sortBy: SimilarityPictureSortParam = {
orderType: 'desc',
orderName: 'similarityScore',
}
const huadong=ref(false)
const timer = ref()
const workStore = useWorkOrder()
const selectTask = ref<any>(null)
@ -649,6 +650,13 @@ function tishiokthree(){
})
}
function handleMouseEnter(){
huadong.value=true
}
function handleMouseLeave(){
huadong.value=false
}
/**
* 检查查重状态
*/
@ -736,13 +744,13 @@ defineExpose({
<n-spin :show="loading">
<div ref="el" class="scroll">
<!-- <div class="scroll"> -->
<div class="wrapper-detail">
<div class="wrapper-detail" :style=" isFullScreen?{height:'596px'}:{}">
<!-- 左侧大图 图片信息 -->
<div
class="left"
:style="{
'background-image': `url(${taskDetailInfo?.imgurl})`,
'flex': imgbigshow ? '0.65' : '0.98',
'flex':isFullScreen? imgbigshow ? '0.77' : '0.98':'0.65',
'height': imgbigshow ? ' 100%' : '80vh',
'background-size': imgbigshow ? 'auto 100%' : 'cover',
}"
@ -866,7 +874,7 @@ defineExpose({
</div>
<!-- 缩放线 -->
<div
v-show="isFullScreen"
v-show="isFullScreen&&imgbigshow==false?true:isFullScreen&&huadong?true:false"
:style="{
position: 'absolute',
zIndex: 169,
@ -874,11 +882,13 @@ defineExpose({
right: imgbigshow ? '-23px' : '0',
marginTop: '5px',
width: '2px',
height: imgbigshow ? '340px' : '79vh',
height: imgbigshow ? '587px' : '79vh',
}"
/>
<div
v-show="isFullScreen"
@mouseenter="handleMouseEnter"
@mouseleave="handleMouseLeave"
v-show="isFullScreen&&imgbigshow==false?true:isFullScreen&&huadong?true:false"
class="aside-collapse-btn"
:style="{
position: 'absolute',
@ -896,7 +906,13 @@ defineExpose({
</div>
</div>
<PictureInfo v-show="imgbigshow" :task-detail-info="taskDetailInfo" />
<PictureInfo
@mouseenter="handleMouseEnter"
@mouseleave="handleMouseLeave"
:style="{
'flex':isFullScreen? '0.24' : '0.35',
'padding-right': '0px'
}" v-show="imgbigshow" :task-detail-info="taskDetailInfo" />
</div>
<div
@ -1096,6 +1112,7 @@ defineExpose({
.scroll {
height: 100%;
overflow-y: scroll;
}
&-header {

Write Preview
Loading…
Cancel
Save