Skip to content

F
founder_vue
Commit 135a9421 by 米嘉伟
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents 2681d1c1 050d11b1
Showing with 1613 additions and 102 deletions
public/iconfont/demo.css 0 → 100644
/* Logo 字体 */
@font-face {
font-family: "iconfont logo";
src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
}
.logo {
font-family: "iconfont logo";
font-size: 160px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
/* tabs */
.nav-tabs {
position: relative;
}
.nav-tabs .nav-more {
position: absolute;
right: 0;
bottom: 0;
height: 42px;
line-height: 42px;
color: #666;
}
#tabs {
border-bottom: 1px solid #eee;
}
#tabs li {
cursor: pointer;
width: 100px;
height: 40px;
line-height: 40px;
text-align: center;
font-size: 16px;
border-bottom: 2px solid transparent;
position: relative;
z-index: 1;
margin-bottom: -1px;
color: #666;
}
#tabs .active {
border-bottom-color: #f00;
color: #222;
}
.tab-container .content {
display: none;
}
/* 页面布局 */
.main {
padding: 30px 100px;
width: 960px;
margin: 0 auto;
}
.main .logo {
color: #333;
text-align: left;
margin-bottom: 30px;
line-height: 1;
height: 110px;
margin-top: -50px;
overflow: hidden;
*zoom: 1;
}
.main .logo a {
font-size: 160px;
color: #333;
}
.helps {
margin-top: 40px;
}
.helps pre {
padding: 20px;
margin: 10px 0;
border: solid 1px #e7e1cd;
background-color: #fffdef;
overflow: auto;
}
.icon_lists {
width: 100% !important;
overflow: hidden;
*zoom: 1;
}
.icon_lists li {
width: 100px;
margin-bottom: 10px;
margin-right: 20px;
text-align: center;
list-style: none !important;
cursor: default;
}
.icon_lists li .code-name {
line-height: 1.2;
}
.icon_lists .icon {
display: block;
height: 100px;
line-height: 100px;
font-size: 42px;
margin: 10px auto;
color: #333;
-webkit-transition: font-size 0.25s linear, width 0.25s linear;
-moz-transition: font-size 0.25s linear, width 0.25s linear;
transition: font-size 0.25s linear, width 0.25s linear;
}
.icon_lists .icon:hover {
font-size: 100px;
}
.icon_lists .svg-icon {
/* 通过设置 font-size 来改变图标大小 */
width: 1em;
/* 图标和文字相邻时，垂直对齐 */
vertical-align: -0.15em;
/* 通过设置 color 来改变 SVG 的颜色/fill */
fill: currentColor;
/* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
normalize.css 中也包含这行 */
overflow: hidden;
}
.icon_lists li .name,
.icon_lists li .code-name {
color: #666;
}
/* markdown 样式 */
.markdown {
color: #666;
font-size: 14px;
line-height: 1.8;
}
.highlight {
line-height: 1.5;
}
.markdown img {
vertical-align: middle;
max-width: 100%;
}
.markdown h1 {
color: #404040;
font-weight: 500;
line-height: 40px;
margin-bottom: 24px;
}
.markdown h2,
.markdown h3,
.markdown h4,
.markdown h5,
.markdown h6 {
color: #404040;
margin: 1.6em 0 0.6em 0;
font-weight: 500;
clear: both;
}
.markdown h1 {
font-size: 28px;
}
.markdown h2 {
font-size: 22px;
}
.markdown h3 {
font-size: 16px;
}
.markdown h4 {
font-size: 14px;
}
.markdown h5 {
font-size: 12px;
}
.markdown h6 {
font-size: 12px;
}
.markdown hr {
height: 1px;
border: 0;
background: #e9e9e9;
margin: 16px 0;
clear: both;
}
.markdown p {
margin: 1em 0;
}
.markdown>p,
.markdown>blockquote,
.markdown>.highlight,
.markdown>ol,
.markdown>ul {
width: 80%;
}
.markdown ul>li {
list-style: circle;
}
.markdown>ul li,
.markdown blockquote ul>li {
margin-left: 20px;
padding-left: 4px;
}
.markdown>ul li p,
.markdown>ol li p {
margin: 0.6em 0;
}
.markdown ol>li {
list-style: decimal;
}
.markdown>ol li,
.markdown blockquote ol>li {
margin-left: 20px;
padding-left: 4px;
}
.markdown code {
margin: 0 3px;
padding: 0 5px;
background: #eee;
border-radius: 3px;
}
.markdown strong,
.markdown b {
font-weight: 600;
}
.markdown>table {
border-collapse: collapse;
border-spacing: 0px;
empty-cells: show;
border: 1px solid #e9e9e9;
width: 95%;
margin-bottom: 24px;
}
.markdown>table th {
white-space: nowrap;
color: #333;
font-weight: 600;
}
.markdown>table th,
.markdown>table td {
border: 1px solid #e9e9e9;
padding: 8px 16px;
text-align: left;
}
.markdown>table th {
background: #F7F7F7;
}
.markdown blockquote {
font-size: 90%;
color: #999;
border-left: 4px solid #e9e9e9;
padding-left: 0.8em;
margin: 1em 0;
}
.markdown blockquote p {
margin: 0;
}
.markdown .anchor {
opacity: 0;
transition: opacity 0.3s ease;
margin-left: 8px;
}
.markdown .waiting {
color: #ccc;
}
.markdown h1:hover .anchor,
.markdown h2:hover .anchor,
.markdown h3:hover .anchor,
.markdown h4:hover .anchor,
.markdown h5:hover .anchor,
.markdown h6:hover .anchor {
opacity: 1;
display: inline-block;
}
.markdown>br,
.markdown>p>br {
clear: both;
}
.hljs {
display: block;
background: white;
padding: 0.5em;
color: #333333;
overflow-x: auto;
}
.hljs-comment,
.hljs-meta {
color: #969896;
}
.hljs-string,
.hljs-variable,
.hljs-template-variable,
.hljs-strong,
.hljs-emphasis,
.hljs-quote {
color: #df5000;
}
.hljs-keyword,
.hljs-selector-tag,
.hljs-type {
color: #a71d5d;
}
.hljs-literal,
.hljs-symbol,
.hljs-bullet,
.hljs-attribute {
color: #0086b3;
}
.hljs-section,
.hljs-name {
color: #63a35c;
}
.hljs-tag {
color: #333333;
}
.hljs-title,
.hljs-attr,
.hljs-selector-id,
.hljs-selector-class,
.hljs-selector-attr,
.hljs-selector-pseudo {
color: #795da3;
}
.hljs-addition {
color: #55a532;
background-color: #eaffea;
}
.hljs-deletion {
color: #bd2c00;
background-color: #ffecec;
}
.hljs-link {
text-decoration: underline;
}
/* 代码高亮 */
/* PrismJS 1.15.0
https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
/**
* prism.js default theme for JavaScript, CSS and HTML
* Based on dabblet (http://dabblet.com)
* @author Lea Verou
*/
code[class*="language-"],
pre[class*="language-"] {
color: black;
background: none;
text-shadow: 0 1px white;
font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
text-align: left;
white-space: pre;
word-spacing: normal;
word-break: normal;
word-wrap: normal;
line-height: 1.5;
-moz-tab-size: 4;
-o-tab-size: 4;
tab-size: 4;
-webkit-hyphens: none;
-moz-hyphens: none;
-ms-hyphens: none;
hyphens: none;
}
pre[class*="language-"]::-moz-selection,
pre[class*="language-"] ::-moz-selection,
code[class*="language-"]::-moz-selection,
code[class*="language-"] ::-moz-selection {
text-shadow: none;
background: #b3d4fc;
}
pre[class*="language-"]::selection,
pre[class*="language-"] ::selection,
code[class*="language-"]::selection,
code[class*="language-"] ::selection {
text-shadow: none;
background: #b3d4fc;
}
@media print {
code[class*="language-"],
pre[class*="language-"] {
text-shadow: none;
}
}
/* Code blocks */
pre[class*="language-"] {
padding: 1em;
margin: .5em 0;
overflow: auto;
}
:not(pre)>code[class*="language-"],
pre[class*="language-"] {
background: #f5f2f0;
}
/* Inline code */
:not(pre)>code[class*="language-"] {
padding: .1em;
border-radius: .3em;
white-space: normal;
}
.token.comment,
.token.prolog,
.token.doctype,
.token.cdata {
color: slategray;
}
.token.punctuation {
color: #999;
}
.namespace {
opacity: .7;
}
.token.property,
.token.tag,
.token.boolean,
.token.number,
.token.constant,
.token.symbol,
.token.deleted {
color: #905;
}
.token.selector,
.token.attr-name,
.token.string,
.token.char,
.token.builtin,
.token.inserted {
color: #690;
}
.token.operator,
.token.entity,
.token.url,
.language-css .token.string,
.style .token.string {
color: #9a6e3a;
background: hsla(0, 0%, 100%, .5);
}
.token.atrule,
.token.attr-value,
.token.keyword {
color: #07a;
}
.token.function,
.token.class-name {
color: #DD4A68;
}
.token.regex,
.token.important,
.token.variable {
color: #e90;
}
.token.important,
.token.bold {
font-weight: bold;
}
.token.italic {
font-style: italic;
}
.token.entity {
cursor: help;
}
public/iconfont/demo_index.html 0 → 100644
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8"/>
<title>iconfont Demo</title>
<link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
<link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
<link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
<link rel="stylesheet" href="demo.css">
<link rel="stylesheet" href="iconfont.css">
<script src="iconfont.js"></script>
<!-- jQuery -->
<script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
<!-- 代码高亮 -->
<script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
<style>
.main .logo {
margin-top: 0;
height: auto;
}
.main .logo a {
display: flex;
align-items: center;
}
.main .logo .sub-title {
margin-left: 0.5em;
font-size: 22px;
color: #fff;
background: linear-gradient(-45deg, #3967FF, #B500FE);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
</style>
</head>
<body>
<div class="main">
<h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
<img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
</a></h1>
<div class="nav-tabs">
<ul id="tabs" class="dib-box">
<li class="dib active"><span>Unicode</span></li>
<li class="dib"><span>Font class</span></li>
<li class="dib"><span>Symbol</span></li>
</ul>
<a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=2961960" target="_blank" class="nav-more">查看项目</a>
</div>
<div class="tab-container">
<div class="content unicode" style="display: block;">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe601;</span>
<div class="name">返回</div>
<div class="code-name">&amp;#xe601;</div>
</li>
</ul>
<div class="article markdown">
<h2 id="unicode-">Unicode 引用</h2>
<hr>
<p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
<ul>
<li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
<li>默认情况下不支持多色，直接添加多色图标会自动去色。</li>
</ul>
<blockquote>
<p>注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）</p>
</blockquote>
<p>Unicode 使用步骤如下：</p>
<h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1637734956272') format('woff2'),
url('iconfont.woff?t=1637734956272') format('woff'),
url('iconfont.ttf?t=1637734956272') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
<pre><code class="language-css"
>.iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
</code></pre>
<h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
<pre>
<code class="language-html"
>&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
</code></pre>
<blockquote>
<p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
</blockquote>
</div>
</div>
<div class="content font-class">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-fanhui"></span>
<div class="name">
返回
</div>
<div class="code-name">.icon-fanhui
</div>
</li>
</ul>
<div class="article markdown">
<h2 id="font-class-">font-class 引用</h2>
<hr>
<p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
<p>与 Unicode 使用方式相比，具有如下特点：</p>
<ul>
<li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
<li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
</ul>
<p>使用步骤如下：</p>
<h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
</code></pre>
<h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
</code></pre>
<blockquote>
<p>"
iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
</blockquote>
</div>
</div>
<div class="content symbol">
<ul class="icon_lists dib-box">
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-fanhui"></use>
</svg>
<div class="name">返回</div>
<div class="code-name">#icon-fanhui</div>
</li>
</ul>
<div class="article markdown">
<h2 id="symbol-">Symbol 引用</h2>
<hr>
<p>这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：</p>
<ul>
<li>支持多色图标了，不再受单色限制。</li>
<li>通过一些技巧，支持像字体那样，通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
<li>兼容性较差，支持 IE9+，及现代浏览器。</li>
<li>浏览器渲染 SVG 的性能一般，还不如 png。</li>
</ul>
<p>使用步骤如下：</p>
<h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
</code></pre>
<h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
<pre><code class="language-html">&lt;style&gt;
.icon {
width: 1em;
height: 1em;
vertical-align: -0.15em;
fill: currentColor;
overflow: hidden;
}
&lt;/style&gt;
</code></pre>
<h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
&lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
&lt;/svg&gt;
</code></pre>
</div>
</div>
</div>
</div>
<script>
$(document).ready(function () {
$('.tab-container .content:first').show()
$('#tabs li').click(function (e) {
var tabContent = $('.tab-container .content')
var index = $(this).index()
if ($(this).hasClass('active')) {
return
} else {
$('#tabs li').removeClass('active')
$(this).addClass('active')
tabContent.hide().eq(index).fadeIn()
}
})
})
</script>
</body>
</html>
public/iconfont/iconfont.css 0 → 100644
@font-face {
font-family: "iconfont"; /* Project id 2961960 */
src: url('iconfont.woff2?t=1637734956272') format('woff2'),
url('iconfont.woff?t=1637734956272') format('woff'),
url('iconfont.ttf?t=1637734956272') format('truetype');
}
.iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-fanhui:before {
content: "\e601";
}
public/iconfont/iconfont.js 0 → 100644
!function(e){var t,n,o,i,c,d='<svg><symbol id="icon-fanhui" viewBox="0 0 1536 1024"><path d="M1058.377143 1002.934857l420.571428-420.571428a69.485714 69.485714 0 0 0 18.285715-67.657143c0-18.285714-6.436571-36.571429-20.187429-51.2L1058.377143 45.641143a69.485714 69.485714 0 0 0-98.742857 0 69.485714 69.485714 0 0 0 0 98.742857l317.293714 317.293714H81.846857a70.436571 70.436571 0 0 0 0 140.8h1176.722286l-300.836572 300.763429a70.656 70.656 0 0 0 0 99.693714 70.070857 70.070857 0 0 0 100.571429 0z" fill="#B1B6C2" ></path></symbol></svg>',a=(a=document.getElementsByTagName("script"))[a.length-1].getAttribute("data-injectcss"),l=function(e,t){t.parentNode.insertBefore(e,t)};if(a&&!e.__iconfont__svg__cssinject__){e.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(e){console&&console.log(e)}}function s(){c||(c=!0,o())}function r(){try{i.documentElement.doScroll("left")}catch(e){return void setTimeout(r,50)}s()}t=function(){var e,t;(t=document.createElement("div")).innerHTML=d,d=null,(e=t.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",t=e,(e=document.body).firstChild?l(t,e.firstChild):e.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(n=function(){document.removeEventListener("DOMContentLoaded",n,!1),t()},document.addEventListener("DOMContentLoaded",n,!1)):document.attachEvent&&(o=t,i=e.document,c=!1,r(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,s())})}(window);
\ No newline at end of file
public/iconfont/iconfont.json 0 → 100644
{
"id": "2961960",
"name": "指纹",
"font_family": "iconfont",
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "25962198",
"name": "返回",
"font_class": "fanhui",
"unicode": "e601",
"unicode_decimal": 58881
}
]
}
public/index.html
......@@ -49,6 +49,7 @@
<script src="<%= BASE_URL %>image-edit/js/tui-image-editor.js"></script>
<script src="<%= BASE_URL %>image-edit/js/fabric-irregular.js"></script>
<script src="<%= BASE_URL %>js/rotate_matrix.js"></script>
<script src="<%= BASE_URL %>iconfont/iconfont.js"></script>
<!-- <script src="<%= BASE_URL %>image-edit/js/ui.js"></script>
<script src="<%= BASE_URL %>image-edit/js/action.js"></script> -->
<!-- <script src="<%= BASE_URL %>image-edit/js/service-basic.js"></script> -->
......
src/App.vue
......@@ -69,4 +69,17 @@ export default {
font-weight: normal;
}
}
// 修改多选框样式
/deep/ .el-checkbox.is-checked {
.el-checkbox__label {
color: #333333;
}
.el-checkbox__input.is-checked {
.el-checkbox__inner {
background: #055fe7;
border-color: #055fe7;
}
}
}
</style>
src/assets/styles/main.scss
......@@ -140,3 +140,24 @@ img {
.ns-text-align {
text-align: center;
}
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条 必写
}
// 滚动条的滑块
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: #dadde0;
border-radius: 3px;
}
// 表头
/deep/ .has-gutter {
font-weight: normal;
th {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #282f3c;
font-weight: normal;
}
}
src/components/ImageEd.scss
......@@ -1303,6 +1303,29 @@ div {
border: 2px solid $sourceB;
display: flex;
flex-direction: column;
.del-pre {
display: flex;
align-items: center;
justify-content: center;
position: absolute;
flex-direction: column;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: transparent;
z-index: 999;
.del-img {
width: 419px;
height: 191px;
}
.del-name {
margin-top: 60px;
font-size: 24px;
font-family: MicrosoftYaHei;
color: #CCCCCC;
}
}
.shade_source {
position: absolute;
top: 0;
......@@ -1330,6 +1353,31 @@ div {
font-family: MicrosoftYaHei;
color: #333333;
margin: 16px 0 0 24px;
display: flex;
align-items: center;
justify-content: space-between;
}
.delDesc {
display: flex;
align-items: center;
font-size: 16px;
.del-icon {
width: 16px;
height: 16px;
margin-right: 3px;
}
.scsj {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #E60012;
opacity: 0.5;
}
.scsj-content {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #E60012;
margin-right: 24px;
}
}
.edit {
width: 72px;
......@@ -1343,7 +1391,7 @@ div {
justify-content: center;
align-items: center;
cursor: pointer;
margin: 60px 0 0 244px;
margin: 60px 0 0 225px;
}
.drawing {
width: 520px;
......@@ -1399,6 +1447,29 @@ div {
border: 2px solid $targetB;
display: flex;
flex-direction: column;
.del-pre {
display: flex;
align-items: center;
justify-content: center;
position: absolute;
flex-direction: column;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: transparent;
z-index: 999;
.del-img {
width: 419px;
height: 191px;
}
.del-name {
margin-top: 60px;
font-size: 24px;
font-family: MicrosoftYaHei;
color: #CCCCCC;
}
}
.shade_target {
position: absolute;
top: 0;
......@@ -1439,7 +1510,7 @@ div {
justify-content: center;
align-items: center;
cursor: pointer;
margin: 60px 0 0 244px;
margin: 60px 0 0 225px;
}
.drawing {
width: 520px;
......
src/components/ImageEd.vue
......@@ -383,7 +383,18 @@
</div>
<div class="lt_middle_main">
<div class="source" @click.self="sourceEdit">
<div class="title">源数据</div>
<div class="del-pre" v-if="isDelete">
<img class="del-img" src="@/assets/img/delete-image.png" alt="">
<div class="del-name">图像已删除</div>
</div>
<div class="title">
<span>源数据</span>
<div class="delDesc" v-if="isDelete">
<img class="del-icon" src="@/assets/img/del-time.png" alt="">
<span class="scsj">删除时间：</span>
<span class="scsj-content">{{delTime}}</span>
</div>
</div>
<div class="preview-source" v-show="isShowSourcePrivew">
<img :src="previewSource" alt="">
</div>
......@@ -397,6 +408,10 @@
<div class="shade_source" v-show="type=='target'" @click.self="sourceEdit"></div>
</div>
<div class="target" @click.self="targetEdit">
<div class="del-pre" v-if="isDelete">
<img class="del-img" src="@/assets/img/delete-image2.png" alt="">
<div class="del-name">源数据已删除，目标图像不显示</div>
</div>
<div class="title">目标数据</div>
<div class="preview-target" v-show="isShowTargetPrivew">
<img :src="previewTarget" alt="">
......@@ -704,7 +719,13 @@ export default {
startPlaceTarget: 0,
//target的曲线对象集合
path2: [],
path: []
path: [],
// 是否被删除
isDelete: false,
// 删除的信息
delMsg: '',
// 删除的时间
delTime: ''
};
},
components: {
......@@ -1713,7 +1734,6 @@ export default {
});
// 改变颜色
brushColorpicker.on("selectColor", function(event) {
event.stopPropagation()
if (self.type == "source") {
imageEditor.setBrush({
color: hexToRGBa(event.color, 1)
......@@ -1761,7 +1781,6 @@ export default {
// 标记点颜色改变
BJDColorpicker.on("selectColor", function(e) {
e.stopPropagation()
document.getElementsByTagName("body")[0].style.setProperty("--BJDcolor", e.color);
if (self.type == "source") {
self.sourceBJDColor = e.color;
......@@ -1777,7 +1796,6 @@ export default {
// 正片叠底
multiplyColorpicker.on("selectColor", function(e) {
e.stopPropagation()
if (self.type == "source") {
applyOrRemoveFilter(true, "blendColor", {
color: e.color
......@@ -1806,7 +1824,6 @@ export default {
// 差异化
blendColorpicker.on("selectColor", function(e) {
e.stopPropagation()
if (self.type == "source") {
applyOrRemoveFilter(true, "blendColor", {
color: e.color
......@@ -1911,6 +1928,27 @@ export default {
self.isActive_history = false
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)");
})
this.$bus.on('deleteMessage', (obj) => {
if(obj.delTime != null) {
self.isDelete = true
self.delMsg = obj.msg
self.delTime = obj.delTime
self.sourceImage = null;
imageEditor.loadImageFromURL("xxx", "SampleImage").then(function(sizeValue) {
// console.log(sizeValue);
imageEditor.clearUndoStack();
});
imageEditor2.loadImageFromURL("xxx", "SampleImage").then(function(sizeValue) {
// console.log(sizeValue);
imageEditor2.clearUndoStack();
});
} else {
self.isDelete = false
self.delMsg = ''
self.delTime = ''
}
})
},
methods: {
/**
......
src/store/index.js
......@@ -14,6 +14,7 @@ import user from "./modules/user";
import zwbj from "./modules/zwbj"
import layout from "./modules/layout"
import publicData from "./modules/publicData"
import rydaxx from "./modules/rydaxx";
Vue.use(Vuex);
......@@ -22,7 +23,8 @@ const store = new Vuex.Store({
user,
zwbj,
layout,
publicData
publicData,
rydaxx
},
getters,
plugins: [
......
src/store/modules/mutations-types.js
......@@ -13,3 +13,6 @@ export const SET_ZYHZ = 'setZyhz';
export const SET_YXHZ = 'setYxhz';
export const SET_AUTOYXHZ = 'setAutoYxhz'
export const SET_AUTOZYHZ = 'setAutoZyhz'
// 人员档案信息
export const SET_RYINFO = 'setRyInfo'
src/store/modules/rydaxx.js 0 → 100644
/*
* @Author: your name
* @Date: 2021-11-04 11:12:33
* @LastEditTime: 2021-11-11 23:22:08
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js
*/
import { SET_RYINFO } from "./mutations-types";
const state = {
// 当前的指位
ryInfo: {}
};
const mutations = {
[SET_RYINFO] (state, content) {
state.ryInfo = content
},
};
const actions = {
};
export default {
namespaced: true,
state,
mutations,
actions
};
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -234,6 +234,7 @@
content="关注"
placement="top"
:open-delay="500"
@click.stop
>
<div
v-if="scope.row.collectstatus == 1"
......@@ -905,6 +906,7 @@ export default {
handleClick (row) {
this.closeSelected();
console.log(row);
this.$store.commit('rydaxx/setRyInfo', row)
this.$router.push("/ryzwbj/" + row.id + "/" + row.ysxtAsjxgrybh);
},
/**
......
src/views/Editor/modules/ajzwbjLeft.vue
......@@ -218,7 +218,7 @@ export default {
this.$axios({
method: 'post',
// url: '/api/org/case/' + self.id + '?mnt=1'
url: `/api/png/caseEBybarcode/barcode`,
url: `/api/org/caseBybarcode/barcode`,
data: {
barcode: self.barcode
}
......
src/views/Editor/modules/imageEd.scss
......@@ -979,7 +979,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
background: transparent;
overflow: hidden;
transform-origin: 320px 320px;
z-index: 9999;
//z-index: 9999;
// transform-origin: $transOrigin;
// background-color: #999;
}
......@@ -1038,11 +1038,13 @@ $transOrigin: var(--transOrigin, 0px, 0px);
.options-top {
position: relative;
width: 336px;
height: 322px;
background: #f6f8fa;
height: 184px;
background: #F6F8FA;
box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.25);
border-radius: 4px;
.top-title {
position: relative;
height: 40px;
height: 32px;
display: flex;
justify-content: space-between;
align-items: center;
......@@ -1132,7 +1134,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
width: 336px;
height: 1px;
background: #d1d1d1;
margin-bottom: 24px;
margin-bottom: 12px;
}
.options-btns {
display: flex;
......@@ -1228,7 +1230,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
}
}
.bzd {
margin-left: 24px;
margin-left: 20px;
cursor: pointer;
width: 40px;
height: 40px;
......@@ -1245,8 +1247,37 @@ $transOrigin: var(--transOrigin, 0px, 0px);
}
}
.bzd-d {
margin-left: 24px;
margin-left: 20px;
cursor: pointer;
width: 40px;
height: 40px;
img {
cursor: pointer;
width: 40px;
height: 40px;
}
}
.dp{
cursor: pointer;
margin-left: 20px;
width: 40px;
height: 40px;
background: #ffffff;
box-shadow: 0px 2px 4px 0px rgba(5, 95, 231, 0.3),
0px 0px 4px 0px rgba(5, 95, 231, 0.15);
border-radius: 4px;
display: flex;
justify-content: center;
align-items: center;
img {
cursor: pointer;
width: 25px;
height: 25px;
}
}
.dp-d {
cursor: pointer;
margin-left: 20px;
width: 40px;
height: 40px;
img {
......@@ -1280,7 +1311,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
}
}
.xstz {
margin-top: 24px;
//margin-top: 24px;
}
.zdtq-line {
width: 304px;
......@@ -1379,10 +1410,41 @@ $transOrigin: var(--transOrigin, 0px, 0px);
}
.save {
margin-top: 20px;
margin-left: 130px;
display: flex;
width: 100%;
align-items: center;
.save-types {
margin-left: 14px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999999;
}
.dqzwtz,.qbzwtz {
width: 32px;
height: 32px;
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #AEB5C2;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
img {
cursor: pointer;
height: 100%;
width: auto;
}
&:hover {
border: 1px solid #055FE7;
}
}
.qbzwtz {
margin-left: 9px;
}
.active {
border: 1px solid #055FE7;
}
.save-type {
cursor: pointer;
font-size: 14px;
......@@ -1395,7 +1457,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
}
}
.save-btn {
margin-left: 16px;
margin-left: 58px;
cursor: pointer;
width: 72px;
height: 32px;
......@@ -1444,8 +1506,10 @@ $transOrigin: var(--transOrigin, 0px, 0px);
.options-bottom {
margin-top: 16px;
width: 336px;
height: 350px;
background: #f6f8fa;
height: 512px;
background: #F6F8FA;
box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.25);
border-radius: 4px;
.options-bottom-title {
padding-left: 16px;
width: 336px;
......
src/views/Editor/modules/imageEd.vue
......@@ -205,6 +205,12 @@
<div class="bzd-d" @click="directionChange" v-show="!isdirection">
<img src="@/assets/img/rybj/bzd_d.png" alt="">
</div>
<div class="dp" v-if="isAutoTzd" @mouseup="isAutoTzd=false;">
<img src="@/assets/img/rybj/dp.png" alt="" />
</div>
<div class="dp-d" @mousedown="getAutoTzd(true)" v-else>
<img src="@/assets/img/rybj/dp_d.png" alt="" />
</div>
</div>
<div class="xstz">
<el-checkbox v-model="isTZ">显示特征</el-checkbox>
......@@ -212,26 +218,30 @@
<!-- <div class="xszyqy">
<el-checkbox v-model="isZYQY">显示重要区域</el-checkbox>
</div> -->
<div class="zdtq-line"></div>
<div class="btns-bottom">
<!-- <div class="dp" @click="getAutoTzd(true)"><img src="@/assets/img/rybj/dp.png" alt=""></div>-->
<div class="dp" v-if="isAutoTzd" @mouseup="isAutoTzd=false;">
<img src="@/assets/img/rybj/dp.png" alt="" />
</div>
<div class="dp-d" @mousedown="getAutoTzd(true)" v-else>
<img src="@/assets/img/rybj/dp_d.png" alt="" />
<!-- <div class="zdtq-line"></div>-->
<!-- <div class="btns-bottom">
<div class="dp" @click="getAutoTzd(true)"><img src="@/assets/img/rybj/dp.png" alt=""></div>
<div class="clear" @click="clearChange"><img src="@/assets/img/rybj/clear.png" alt=""></div>
<div class="clearConfirm" v-show="isShowClearDialog">
<div class="tips">确认要清空操作吗？该操作无法撤消！</div>
<div class="btn-bottom">
<div class="btn-confirm" @click="delPic">确认</div>
<div class="btn-cancel" @click="cancelPic">取消</div>
</div>
</div>
<!-- <div class="clear" @click="clearChange"><img src="@/assets/img/rybj/clear.png" alt=""></div>-->
<!-- <div class="clearConfirm" v-show="isShowClearDialog">-->
<!-- <div class="tips">确认要清空操作吗？该操作无法撤消！</div>-->
<!-- <div class="btn-bottom">-->
<!-- <div class="btn-confirm" @click="delPic">确认</div>-->
<!-- <div class="btn-cancel" @click="cancelPic">取消</div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>-->
<div class="save">
<div class="save-type" @click="saveTypeOptionsChange">{{ saveType }}<img src="@/assets/img/rybj/arrow_d.png" alt=""></div>
<div class="save-types">选择保存类型：</div>
<div class="dqzwtz" :class="{active: saveType==='当前指位特征'}" @click.stop="changeSaveType('当前指位特征')">
<img src="@/assets/img/rybj/dqzw.png" alt="">
</div>
<div class="qbzwtz" :class="{active: saveType==='全部指位特征'}" @click.stop="changeSaveType('全部指位特征')">
<img src="@/assets/img/rybj/qbzw.png" alt="">
</div>
<div class="save-btn" v-if="saveType==''">保存</div>
<div class="save-btn isActive" v-else @click="goSave">保存</div>
<!-- <div class="save-type" @click="saveTypeOptionsChange">{{ saveType }}<img src="@/assets/img/rybj/arrow_d.png" alt=""></div>
<div class="save-btn" v-if="saveType==''">保存</div>
<div class="save-btn isActive" v-else @click="goSave">保存</div>
<div class="save-type-options" v-show="isShowSaveTypeOptions">
......@@ -243,7 +253,7 @@
<div class="item-selected"><span v-show="saveType==='全部指位特征'">√</span></div>
<div class="item-name">全部指位特征</div>
</div>
</div>
</div>-->
</div>
</div>
<div class="options-bottom">
......@@ -1255,7 +1265,8 @@ export default {
imageEditor.loadImageFromURL("data:image/jpeg;base64," + sourceImage, "SampleImage").then(function (sizeValue) {
// 更新工具栏的优先级
setTimeout(() => {
$(".center").css('z-index', '99999')
// TODO
// $(".center").css('z-index', '99999')
// 旋转下拉框
$(".rotateOptions").css('z-index', '99999')
}, 1200)
......
src/views/Editor/modules/imageEdAJ.vue
......@@ -5262,16 +5262,18 @@ export default {
let sendSrc = datasrc.split(',')[1]
console.log(sendSrc);*/
// 转8位bmp格式图片
let canvas_imgSave = document.querySelector('.tui-image-editor-canvas-container .lower-canvas');
/*let canvas_imgSave = document.querySelector('.tui-image-editor-canvas-container .lower-canvas');
const grey = new Bmp(Bmp.GREY, canvas_imgSave);
console.log(typeof grey.getBase64());
let tj_grey = grey.getBase64().split(',')[1]
console.log(tj_grey);
console.log(tj_grey);*/
// 获取图像旋转的角度
let canvasImage_angle = self.imageEditor._graphics.getCanvasImage().angle;
this.$axios({
method: "post",
url: `/api/upload/trait/case/image?barcode=${self.barcode}&hpseqno=${self.seq}&fingerPosition=${tj_lr_finger}`,
data: tj_grey
url: `/api/upload/trait/case/image?angle=${canvasImage_angle}&barcode=${self.barcode}&hpseqno=${self.seq}&fingerPosition=${tj_lr_finger}`
}).then((res) => {
console.log(res);
if (res.data.code === 0) {
......
src/views/Editor/modules/rydaxx.scss 0 → 100644
.rydaxx-drawer {
width: 100%;
height: 100%;
/deep/ .el-drawer.rtl {
overflow: auto;
}
.header {
position: fixed;
background: #FFFFFF;
height: 50px;
width: 943px;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 32px;
border-bottom: 1px solid #EEEEEE;
z-index: 999;
.header-title {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282F3C;
}
.header-close {
width: 20px;
height: 14px;
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
.icon {
cursor: pointer;
width: 20px;
height: 14px;
overflow: hidden;
}
}
}
.content {
margin-top: 50px;
overflow: auto;
height: 1700px;
.ayzzwjbxx {
padding: 24px 32px;
/deep/.el-input.is-disabled .el-input__inner {
background-color: #ECEDF1;
color: #AEAFB4;
cursor: not-allowed;
}
/deep/ .el-form-item.is-error .el-input__inner {
width: 264px;
height: 40px;
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #E6E6E8;
}
/deep/ .el-input {
width: 264px;
height: 40px;
}
/deep/ .el-input.is-active .el-input__inner, /deep/ .el-input__inner:focus {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06) !important;
border: 1px solid #E6E6E8 !important;
border-radius: 4px;
}
.title {
display: flex;
align-items: center;
margin-bottom: 20px;
.line {
width: 4px;
height: 16px;
background: #055FE7;
border-radius: 2px;
margin-right: 10px;
}
.name {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282F3C;
}
}
.ayzzwjbxx-items {
.ayzzwjbxx-item {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 24px;
}
/deep/ .el-form-item__label {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
padding: 0;
}
/deep/ .el-form-item__error {
text-align: right;
right: 0;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #FF3745;
}
/deep/ .el-input__icon.el-input__validateIcon.el-icon-circle-close {
width: 16px;
height: 16px;
&::before {
content: " ";
width: 16px;
height: 16px;
background-image: url("../../../assets/img/inputerror.png");
background-repeat: no-repeat;
background-size: cover;
top: 12px;
right: 0;
position: absolute;
}
}
/deep/ .el-input__icon.el-input__validateIcon.el-icon-circle-check {
display: none;
&::before {
display: none;
}
}
/deep/ .el-form-item.el-form-item--feedback.is-error.is-required {
input {
color: #FF3745;
}
}
}
.ayzzwjbxx-item2 {
.select {
/deep/ .el-input {
width: 164px;
height: 40px;
}
/deep/ .el-form-item.is-error .el-input__inner {
width: 164px;
height: 40px;
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #E6E6E8;
}
}
.input2 {
/deep/ .el-form-item__label {
width: 90px !important;
}
/deep/ .el-form-item__content {
margin-left: 90px !important;
}
/deep/ .el-input {
width: 408px;
height: 40px;
input {
width: 408px;
}
}
/deep/ .el-form-item.is-error .el-input__inner {
width: 408px;
height: 40px;
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #E6E6E8;
}
}
.input3 {
/deep/ .el-form-item__content, /deep/ .el-textarea, /deep/ .el-textarea__inner {
width: 722px;
height: 76px;
background: #F6F8FA;
box-shadow: 0px 1px 2px 0px rgba(5, 95, 231, 0.18);
border-radius: 4px;
border: 1px solid #EEEEEE;
}
/deep/ .el-textarea__inner {
padding: 16px;
}
}
}
.horizontal-line {
width: 100%;
height: 1px;
background: #E6E6E8;
margin-bottom: 20px;
}
.ryljfk {
/deep/ .el-form-item__content {
width: 100%;
margin-left: 0 !important;
display: flex;
align-items: center;
margin-right: 24px;
}
/deep/.el-checkbox {
margin-right: 24px;
}
/deep/ .el-checkbox-group {
display: flex;
align-items: center;
}
.fk {
display: flex;
align-items: center;
margin-bottom: 20px;
}
}
}
.horizontal-line {
width: 100%;
height: 1px;
background: #E6E6E8;
margin-bottom: 20px;
}
.form-footer {
z-index: 999;
position: fixed;
bottom: 0;
right: 0;
background: #FFFFFF;
height: 100px;
width: 943px;
display: flex;
align-items: center;
justify-content: center;
.save, .cancel, .export {
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
}
.save {
width: 72px;
height: 40px;
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #AEB5C2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2E3846;
&:hover {
border: 1px solid #055fe7;
color: #055fe7;
}
&:active {
border: 1px solid #044CB9;
color: #044CB9;
}
}
.cancel {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #FFFFFF;
width: 72px;
height: 40px;
background: #055FE7;
border-radius: 4px;
margin: 0 16px;
&:hover {
background: #377FEC;
color: #FFFFFF;
}
&:active {
background: #044CB9;
color: #FFFFFF;
}
}
.export {
width: 96px;
height: 40px;
background: #DDEBFF;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055FE7;
&:hover {
background: #EDF4FF;
color: #055FE7;
}
&:active {
background: #CCE0FF;
color: #055FE7;
}
}
}
}
.arrow-down {
z-index: 999;
cursor: pointer;
position: fixed;
right: 12px;
bottom: 130px;
width: 40px;
height: 40px;
background: #FFFFFF;
box-shadow: 0px 0px 5px 0px rgba(5, 95, 231, 0.4);
border-radius: 20px;
display: flex;
align-items: center;
justify-content: center;
img {
width: 26px;
height: auto;
cursor: pointer;
}
&:hover {
border: 1px solid #0b6cd9;
}
}
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条 必写
}
// 滚动条的滑块
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: #dadde0;
border-radius: 3px;
}
/deep/ .el-drawer__container ::-webkit-scrollbar {
display: none;
}
// 修改多选框样式
/deep/ .el-checkbox.is-checked {
.el-checkbox__label {
color: #333333;
}
.el-checkbox__input.is-checked {
.el-checkbox__inner {
background: #055fe7;
border-color: #055fe7;
}
}
}
/deep/ .el-checkbox__input.is-indeterminate {
.el-checkbox__inner {
background: #055fe7;
border-color: #055fe7;
}
}
/deep/ .el-checkbox__inner:hover {
border-color: #055fe7;
}
}
src/views/Editor/modules/ryzwbjLeft.vue
......@@ -11,8 +11,8 @@
<div class="title">人员编号：</div>
<div class="rybh">
<span>{{barcode}}</span>
<img src="@/assets/img/message.png" alt="">
<div class="desc">档案信息</div>
<img src="@/assets/img/message.png" alt="" @click="daxxChange">
<div class="desc" @click="daxxChange">档案信息</div>
</div>
<div class="ryzwbj-content">
<div class="zzw">
......@@ -269,6 +269,16 @@ export default {
},
methods: {
/**
* 打开档案信息
*/
daxxChange() {
this.$bus.emit('openRyDaxx', true)
// 降低指纹编辑按钮的优先级
$(".center").css('z-index', 9)
$(".tzdDrawing").css('z-index', 9)
$(".tzdDrawing2").css('z-index', 9)
},
/**
* 获取平面/滚动指纹png图片
* @param code
*/
......
src/views/Editor/ryzwbj.vue
......@@ -10,19 +10,22 @@
<div class="ryzwbj">
<ryzwbj-left></ryzwbj-left>
<image-ed></image-ed>
<rydaxx></rydaxx>
</div>
</template>
<script>
import ryzwbjLeft from './modules/ryzwbjLeft.vue';
import imageEd from './modules/imageEd.vue';
import rydaxx from "./modules/rydaxx.vue";
export default {
name: 'ryzwbj',
components: {
ryzwbjLeft,
imageEd
},
}
imageEd,
rydaxx
}
}
</script>
<style lang="scss" scoped>
......@@ -31,4 +34,4 @@ import imageEd from './modules/imageEd.vue';
height: calc(100% - 47px);
display: flex;
}
</style>
\ No newline at end of file
</style>
src/views/cxyrd/modules/LTSrc.vue
......@@ -12,8 +12,28 @@
class="lt_candidate_table border_radius tableHeight" @row-click="getFirgerPrintDetail"
:row-class-name="tableRowClassName">
<el-table-column prop="qqid" label="查询ID" :width="width1"></el-table-column>
<el-table-column prop="barcode" label="源条码号" width="auto"></el-table-column>
<el-table-column prop="fingerCount" label="枚数" :width="width2"></el-table-column>
<el-table-column prop="barcode" label="源条码号" width="auto">
<template slot-scope="scope">
<!-- 被删除-->
<span v-if="scope.row.removeFlag===1">
<del>{{scope.row.barcode}}</del>
</span>
<span v-else>
{{scope.row.barcode}}
</span>
</template>
</el-table-column>
<el-table-column prop="fingerCount" label="枚数" :width="width2">
<template slot-scope="scope">
<!-- 被删除-->
<span v-if="scope.row.removeFlag===1">
<del>{{scope.row.fingerCount}}</del>
</span>
<span v-else>
{{scope.row.fingerCount}}
</span>
</template>
</el-table-column>
</el-table>
<div class="lt_middle_bottom">
<span>该任务共计<span>{{ total }}条</span>查询</span>
......@@ -226,52 +246,78 @@ export default {
let self = this;
// 发送请求
this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
console.log(val);
// 查看该条目是否被删除
this.$axios({
method: "post",
url: `/api/casestore/deletestatus?ysxtAsjbh=${val.barcode}`
}).then(isDelete => {
if (isDelete.data.code === 0) {
if (isDelete.data.ret.deleteflag === "0") {
// 未删除
if (val == null) return;
// 改变数据为点击状态
self.$set(val, "clickLog", "1");
self.currentRow = val;
console.log(val);
self.qqid = val.qqid;
self.qid = val.qid;
// 保存qqid和qid
sessionStorage.setItem("qqid", self.qqid);
sessionStorage.setItem("qid", self.qid);
let barcode = val.barcode;
// 存储原条码号
sessionStorage.setItem("srcbarcode", barcode);
console.log(barcode);
self.$axios.post("/api/png/caseBybarcode/barcode", {
querytype: "2",
barcode: barcode,
qqid: self.qqid
}).then(response => {
// 被删除
if(val.removeFlag === 1) {
self.$bus.emit('deleteMessage', {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:MM')
})
// 清空目标table表
// self.$bus.emit("initCandidate", []);
// 保存qqid和qid
sessionStorage.setItem("qqid", val.qqid);
sessionStorage.setItem("qid", val.qid);
sessionStorage.setItem("srcbarcode", val.barcode);
self.enumerate = [];
self.fingerTotal = 0;
// 请求该条码号的案件指纹图片
self.$axios.post("/api/org/caseBybarcode/barcode", {
querytype: "2",
barcode: val.barcode,
qqid: self.qqid
}).then(response => {
console.log(response);
let imageInfo = response.data.ret[0]
// 默认选中第一个指纹预览图片
sessionStorage.setItem("srcseqno", imageInfo.seq);
sessionStorage.setItem("zcseq", imageInfo.seq);
// 发送请求
this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, { srcbarcode: sessionStorage.getItem("srcbarcode") })
.then(response => {
console.log(response);
self.enumerate = response.data.ret;
self.fingerTotal = response.data.ret.length;
// 默认选中第一个指纹预览图片
self.changeStyle(0, self.enumerate[0]);
self.$bus.emit("initCandidate", response.data.ret);
});
self.isActive = "";
} else {
// 已删除
self.$message.error("该人员已经删除，删除时间是" + isDelete.data.ret.deleteTime);
self.enumerate = [];
self.fingerTotal = 0;
return;
}
} else {
self.$message.error("获取数据错误！");
}
});
self.timer = setTimeout(() => {
self.loading && self.loading.close();
self.loading = null;
}, 1200);
});
} else {
// 没有被删除
self.$bus.emit('deleteMessage', {
msg: null,
delTime: null
})
console.log(val);
if (val == null) return;
// 改变数据为点击状态
self.$set(val, "clickLog", "1");
self.currentRow = val;
console.log(val);
self.qqid = val.qqid;
self.qid = val.qid;
// 保存qqid和qid
sessionStorage.setItem("qqid", self.qqid);
sessionStorage.setItem("qid", self.qid);
let barcode = val.barcode;
// 存储原条码号
sessionStorage.setItem("srcbarcode", barcode);
console.log(barcode);
self.$axios.post("/api/org/caseBybarcode/barcode", {
querytype: "2",
barcode: barcode,
qqid: self.qqid
}).then(response => {
console.log(response);
self.enumerate = response.data.ret;
self.fingerTotal = response.data.ret.length;
// 默认选中第一个指纹预览图片
self.changeStyle(0, self.enumerate[0]);
});
self.isActive = "";
}
clearTimeout(self.timer);
self.timer = setTimeout(() => {
......@@ -1084,4 +1130,10 @@ $tableHeight: var(--tableHeight, 320px);
font-weight: normal;
}
}
del {
text-decoration: none; /*没有文本装饰*/
text-decoration: underline red; /*红色下划线*/
text-decoration: underline wavy red; /*红色波浪形下划线*/
text-decoration: line-through red; /*红色删除线*/
}
</style>
src/views/cxyrd/modules/TLCandidate.vue
......@@ -39,7 +39,9 @@ export default {
total: 0,
// 加载动画
loading: null,
timer: null
timer: null,
// 是否被删除
isDelete: false
};
},
created() {
......@@ -50,6 +52,15 @@ export default {
},
mounted() {
let self = this;
// 监听是否被删除
self.$bus.on('deleteMessage', (obj) => {
if(obj.delTime != null) {
self.isDelete = true
} else {
self.isDelete = false
}
})
this.$bus.on("initTLCandidate", tableData => {
// console.log(tableData);
self.tableData = tableData;
......@@ -76,6 +87,7 @@ export default {
* @return {*}
*/
search() {
if(this.isDelete) return
let self = this;
let dcseq = sessionStorage.getItem("dcseq");
let qqid = sessionStorage.getItem("qqid");
......@@ -100,6 +112,7 @@ export default {
* @param old
*/
handleCurrentChange(val, old) {
if(this.isDelete) return;
const CancelToken = axios.CancelToken;
const source = CancelToken.source();
let self = this;
......@@ -119,13 +132,13 @@ export default {
}
this.$axios
.post("/api/png/caseBybarcode/barcode", {
.post("/api/org/caseBybarcode/barcode", {
barcode: val.destbarcode,
seqno: val.destseqno,
qqid: val.qqid
}, { loading: false, cancelToken: source.token }).then(response => {
console.log(response);
self.$bus.emit("changImageEditTarget", response.data.ret.image);
self.$bus.emit("changImageEditTarget", response.data.ret[0].image);
if (!self.isFirstMounted) {
clearTimeout(self.timer);
self.timer = setTimeout(() => {
......@@ -317,4 +330,10 @@ export default {
/deep/.el-table, /deep/.el-table__expanded-cell {
background: none;
}
del {
text-decoration: none; /*没有文本装饰*/
text-decoration: underline red; /*红色下划线*/
text-decoration: underline wavy red; /*红色波浪形下划线*/
text-decoration: line-through red; /*红色删除线*/
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment