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

Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatesyspic

Browse Source
pull/255/head
raofuzi 1 year ago
parent 721dfb5732 2829fa9a8a
commit a885893342
4 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File

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

@ -22,7 +22,7 @@ index 3aacec9..a63ab54 100644
+ class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error flex`
+ }, [h('img', {
+ style: { width: '1rem', height: '1rem' },
+ src: '/src/assets/icons/notice.svg'
+ src: 'notice.svg'
+ }), feedbackNodes]) : mergedValidationStatus === 'success' ? h("div", {
key: "controlled-success",
class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--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: '/src/assets/icons/notice.svg'
+ style: { width: '1rem', height: '1rem' },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;
});
}

19
public/notice.svg
Unescape View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>警示</title>
<defs>
<rect id="path-1" x="0" y="0" width="64" height="64"></rect>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-664.000000, -6389.000000)">
<g id="警示" transform="translate(664.000000, 6389.000000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<g id="蒙版"></g>
<path d="M32,4 C47.463973,4 60,16.536027 60,32 C60,47.463973 47.463973,60 32,60 C16.536027,60 4,47.463973 4,32 C4,16.536027 16.536027,4 32,4 Z M32,9 C19.2974508,9 9,19.2974508 9,32 C9,44.7025492 19.2974508,55 32,55 C44.7025492,55 55,44.7025492 55,32 C55,19.2974508 44.7025492,9 32,9 Z" id="形状结合" fill="#FF4E4F" mask="url(#mask-2)"></path>
<path d="M32,41.8150625 C33.5403559,41.8150625 34.7890611,43.0637676 34.7890611,44.6041236 C34.7890611,46.1444795 33.5403559,47.3931847 32,47.3931847 C30.4596441,47.3931847 29.2109389,46.1444795 29.2109389,44.6041236 C29.2109389,43.0637676 30.4596441,41.8150625 32,41.8150625 Z M33,16.6068153 C33.5522847,16.6068153 34,17.0545306 34,17.6068153 L34,36.7882606 C34,37.3405453 33.5522847,37.7882606 33,37.7882606 L31,37.7882606 C30.4477153,37.7882606 30,37.3405453 30,36.7882606 L30,17.6068153 C30,17.0545306 30.4477153,16.6068153 31,16.6068153 L33,16.6068153 Z" id="形状结合备份" fill="#FF4E4F" mask="url(#mask-2)"></path>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

39
src/layout/components/Header/ShortcutModal.vue
Unescape View File

@ -65,7 +65,7 @@ defineExpose({
全局快捷方式
</div>
<div class="wrapper-global">
<table style="margin-left: 47px; width: 180px">
<table style="margin-left: 110px; width: 230px">
<tr>
<td><div class="key" data-key="g h" /></td>
<td>进入“一键查看”主页</td>
@ -95,7 +95,7 @@ defineExpose({
<td>打开可疑文件夹</td>
</tr>
</table>
<table style="height: 30%; margin-left: 180px">
<table style="height: 30%; margin-left:115px">
<tr>
<td><div class="key" data-key="[" /></td>
<td>隐藏/显示当前场景左侧筛选区</td>
@ -123,7 +123,24 @@ defineExpose({
任务审批/任务终审/AI工单明细动作
</div>
<div class="wrapper-request">
<table style="margin-left: 47px; width: 180px">
<table style="margin-left: 120px; width: 290px">
<tr>
<td ><div class="key" style="float: left;
margin-left: 5px;" data-key="c" /></td>
<td><div style="float: left;
margin-left: -60px;">关闭（关闭当前场景弹窗）</div></td>
</tr>
<tr>
<td>
<div class="key" data-key="&larr;" />
<span>/</span>
<div class="key" data-key="&rarr;" />
</td>
<td>打开上一条/下一条信息切换</td>
</tr>
</table>
<table style="margin-left: 50px">
<tr>
<td style="text-align: left; width: 53px">
<div class="key" data-key="p p" />
@ -137,24 +154,10 @@ defineExpose({
<td>不通过</td>
</tr>
</table>
<table style="margin-left: 180px">
<tr>
<td><div class="key" data-key="c" /></td>
<td>关闭（关闭当前场景弹窗）</td>
</tr>
<tr>
<td>
<div class="key" data-key="&larr;" />
<span>/</span>
<div class="key" data-key="&rarr;" />
</td>
<td>打开上一条/下一条信息切换</td>
</tr>
</table>
</div>
<div class="wrapper-request">
<table style="margin-left: 47px; width: 180px">
<table style="margin-left: 120px; width: 180px">
<tr>
<td style="text-align: left; width: 53px">
<div class="key" data-key="k k" />

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

@ -202,6 +202,9 @@ const fullscreenStyles = computed<any>(() => ({
// 切换全屏状态
function toggleFullScreen() {
isFullScreen.value = !isFullScreen.value
if(!isFullScreen.value){
imgbigshow.value=true
}
}
onUpdated(() => {

Write Preview
Loading…
Cancel
Save