Skip to content

F
founder_vue
Commit bd837ca8 by liyuhang19990520
Options

解决冲突

parents 06255044 c7a4972b
Showing with 1827 additions and 158 deletions
dist.zip 0 → 100644
File added
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/img/qbryk/fz.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>ic_自定义测试备份</title>
<desc>Created with Sketch.</desc>
<defs>
<rect id="path-1" x="0" y="0" width="16" height="16"></rect>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="FPTX导入任务-比中关系" transform="translate(-1753.000000, -534.000000)">
<g id="ic_自定义测试备份" transform="translate(1752.000000, 533.000000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<use id="矩形" fill="#055FE7" opacity="0" xlink:href="#path-1"></use>
<path d="M13,3 L13,15 L1,15 L1,3 L13,3 Z M12,4 L2,4 L2,14 L12,14 L12,4 Z M15,1 L15,13 L14,13 L14,2 L3,2 L3,1 L15,1 Z" id="形状结合" fill="#055FE7" fill-rule="nonzero" mask="url(#mask-2)"></path>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/qbryk/rgrd.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="15px" viewBox="0 0 14 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>wancheng</title>
<desc>Created with Sketch.</desc>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="FPTX导入任务-比中关系" transform="translate(-1816.000000, -534.000000)" fill="#055FE7" fill-rule="nonzero">
<g id="编组-3" transform="translate(1723.000000, 533.000000)">
<g id="wancheng" transform="translate(93.000000, 1.000000)">
<path d="M7.19235688,6.55969381 C8.71381699,6.55969381 9.95864799,5.33485472 9.95864799,3.83782916 C9.95864799,2.3408036 8.71381699,1.11596451 7.19235688,1.11596451 C5.67089677,1.11596451 4.42606577,2.3408036 4.42606577,3.83782916 C4.42606577,5.33485472 5.64323386,6.55969381 7.19235688,6.55969381 Z M10.1522884,13.6637605 L13.0292311,10.2886484 C13.2228715,10.0708992 13.5824893,10.0164619 13.8037926,10.2342111 C14.0250959,10.4519603 14.0804217,10.778584 13.8591184,10.9963332 L10.6778837,14.7525064 L10.6502208,14.7797251 C10.6502208,14.7797251 10.6502208,14.8069437 10.6225579,14.8069437 C10.4289175,15.0246929 10.0692996,15.0791302 9.84799634,14.861381 L8.16055877,13.47323 C7.93925548,13.2826995 7.88392966,12.9288571 8.10523294,12.7111079 C8.32653623,12.4933587 8.65849117,12.4389215 8.87979445,12.6566706 L10.1522884,13.6637605 L10.1522884,13.6637605 Z M11.9227147,8.02950072 C12.0610292,8.13837531 12.1716809,8.30168719 12.1716809,8.46499907 C12.1716809,8.76440418 11.9227147,9.009372 11.6184227,9.009372 C11.4801081,9.009372 11.3694565,8.9549347 11.2588048,8.87327876 C10.2906029,8.08393801 9.07343483,7.62122102 7.7456151,7.62122102 L6.63909866,7.62122102 C3.59617844,7.62122102 1.10651644,10.0708992 1.10651644,13.0649503 C1.10651644,13.3643554 1.35548264,13.6093233 1.65977466,13.6093233 L6.08584044,13.6093233 C6.39013246,13.6093233 6.63909866,13.8542911 6.63909866,14.1536962 C6.63909866,14.4531013 6.39013246,14.6980691 6.08584044,14.6980691 L1.65977466,14.6980691 C0.746898599,14.6980691 0,13.9631657 0,13.0649503 C0,10.0981179 2.01939251,7.59400238 4.78568362,6.80466163 C3.90047046,6.09697682 3.31954933,5.0354496 3.31954933,3.81061051 C3.31954933,1.71477473 5.06231273,0 7.19235688,0 C9.32240103,0 11.0651644,1.71477473 11.0651644,3.81061051 C11.0651644,5.00823096 10.4842433,6.09697682 9.59903014,6.80466163 C10.4565804,7.07684809 11.2311419,7.48512779 11.9227147,8.02950072 Z" id="形状"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
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"
......@@ -539,8 +540,8 @@ export default {
// 单击行抽屉
handle (row, event, column) {
console.log(row, event, column)
this.drawer = true
this.$bus.emit('isBlur', true)
// this.drawer = true
// this.$bus.emit('isBlur', true)
},
handleClose (done) {
this.$confirm('确认关闭？')
......@@ -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/AllPersonnelBase/gzlb.vue
......@@ -223,6 +223,7 @@
label="性别"
width="200"
show-overflow-tooltip
:formatter="xbdmFormat"
>
</el-table-column>
<el-table-column
......@@ -256,7 +257,7 @@
/>
</div>
</el-tooltip>
<el-tooltip
<!-- <el-tooltip
class="item"
effect="dark"
content="改号"
......@@ -272,7 +273,7 @@
alt=""
/>
</div>
</el-tooltip>
</el-tooltip> -->
<el-tooltip
class="item"
effect="dark"
......@@ -297,10 +298,7 @@
placement="top"
:open-delay="500"
>
<div
class="icon bz"
@click="isShowFztmBtn(scope.row)"
>
<div class="icon bz">
<img
src="../../assets/img/qbryk/bz.svg"
alt=""
......@@ -322,7 +320,7 @@
placement="top-start"
:hide-icon="true"
confirm-button-text="确认"
@onConfirm="delOne(scope.row.id)"
@onConfirm="delOne(scope.row.followPerson.id)"
class="icon del"
title="确认要删除该数据吗？该操作无法撤消！"
>
......@@ -411,7 +409,7 @@
/>
</div>
</el-tooltip>
<el-tooltip
<!-- <el-tooltip
class="item"
effect="dark"
content="改号"
......@@ -427,7 +425,7 @@
alt=""
/>
</div>
</el-tooltip>
</el-tooltip> -->
<el-tooltip
class="item"
......@@ -453,10 +451,7 @@
placement="top"
:open-delay="500"
>
<div
class="icon bz"
@click="isShowFztmBtn(scope.row)"
>
<div class="icon bz">
<img
src="../../assets/img/qbryk/bz.svg"
alt=""
......@@ -478,7 +473,7 @@
placement="top-start"
:hide-icon="true"
confirm-button-text="确认"
@onConfirm="delOne(scope.row.id)"
@onConfirm="delOne(scope.row.followCase.id)"
class="icon del"
title="确认要删除该数据吗？该操作无法撤消！"
>
......@@ -647,10 +642,6 @@ export default {
isShowDcftpx: false, // 导出FPTX
isShowDcfptx1: false,// 导出FPTX
isSelected: false, // 是否批量操作
isShowTjddl: false, // 添加到队列
isShowFztm: false, //复制条码
......@@ -919,6 +910,13 @@ export default {
this.$message.error("请选择需要发查询的数据！");
this.isSelected = true;
} else {
if (this.showType == 1) {
this.type = "ry"
console.log('人员人员')
} else if (this.showType == 2) {
this.type = 'aj'
console.log('案件案件')
}
this.rowData = this.multipleSelection;
this.isShowFcx = true;
}
......@@ -927,6 +925,13 @@ export default {
console.log("单行人员发查询数据", val);
let rowVal = [];
rowVal.push(val);
if (this.showType == 1) {
this.type = "ry"
console.log('人员人员')
} else if (this.showType == 2) {
this.type = 'aj'
console.log('案件案件')
}
this.rowData = rowVal;
this.isShowFcx = true;
},
......@@ -935,6 +940,23 @@ export default {
this.isShowFcx = val;
this.search();
},
// 性别格式化
xbdmFormat (row, colnum) {
let xbdm = row.followPerson.sex;
let showProp = null;
if (xbdm == 0) {
showProp = "未知";
} else if (xbdm == 1) {
showProp = "男";
} else if (xbdm == 2) {
showProp = "女";
} else if (xbdm == 9) {
showProp = "未说明";
} else {
showProp = "---";
}
return showProp;
},
/**
* @description: 是否是批量操作
* @param {*}
......@@ -1062,6 +1084,76 @@ export default {
},
};
</script>
<style lang="scss">
.el-message-box__message {
margin: 23px 24px 17px 24px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.el-message-box__btns {
margin-bottom: 24px;
padding-bottom: 24px;
// 交换 确定 和 取消 按钮的位置
.el-button:nth-child(1) {
float: right;
margin-right: 23%;
width: 72px;
height: 40px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
}
.el-button:nth-child(2) {
float: left;
margin-left: 23%;
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
}
}
.el-popconfirm__main {
margin: 23px 24px 17px 24px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.el-popconfirm__action {
margin-bottom: 24px;
padding-bottom: 24px;
// 交换 确定 和 取消 按钮的位置
.el-button:nth-child(1) {
float: right;
margin-right: 23%;
width: 72px;
height: 32px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
}
.el-button:nth-child(2) {
float: left;
margin-left: 23%;
width: 72px;
height: 32px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
}
}
</style>
<style scoped lang="scss">
/deep/.el-table--scrollable-x .el-table__body-wrapper {
height: 500px;
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -709,7 +709,7 @@ export default {
};
let barcodeArr = []
for (let i = 0; i < this.rowData.length; i++) {
barcodeArr.push(this.rowData[i].ysxtAsjbh)
barcodeArr.push(this.rowData[i].ysxtAsjbh || this.rowData[i].barcode || this.rowData[i].followCase.barcode)
}
reqParam.ysxtAsjbhs = barcodeArr
this.$axios
......@@ -906,8 +906,8 @@ export default {
barcode: '', // 条码号
selectedSeqnos: null // 指位(选择)(页面获取)
}; //发查询源数据
SrcQueryData.id = this.rowData[i].id
SrcQueryData.barcode = this.rowData[i].ysxtAsjxgrybh
SrcQueryData.id = this.rowData[i].id || this.rowData[i].followPerson.id
SrcQueryData.barcode = this.rowData[i].ysxtAsjxgrybh || this.rowData[i].barcode || this.rowData[i].followPerson.barcode
SrcQueryData.selectedSeqnos = selectedSeqnos;
queryRequest.srcQueryDataList.push(SrcQueryData)
}
......@@ -969,8 +969,8 @@ export default {
barcode: '', // 条码号
selectedSeqnos: '' // 现场指纹序号
}; //发查询源数据
SrcQueryData.id = this.rowData[i].id
SrcQueryData.barcode = this.rowData[i].ysxtAsjbh
SrcQueryData.id = this.rowData[i].id || this.rowData[i].followCase.id
SrcQueryData.barcode = this.rowData[i].ysxtAsjbh || this.rowData[i].barcode || this.rowData[i].followCase.barcode
if (this.rowData.length == 1) {
SrcQueryData.selectedSeqnos = this.checkedCities
} else {
......@@ -994,15 +994,19 @@ export default {
let failInfo = response.data.ret.failInfo
this.$message({
dangerouslyUseHTMLString: true,
message: `发查询成功<div>本次发送成功${successBarcode.length}条，<span style='color:red'>发送失败${failInfo.length}条</span></div><div style='color:red'>${failInfo}</div> `,
message: `发查询成功<div>本次发送成功${successBarcode.length}条，<span style='color:red'>发送失败${failInfo.length}条</span></div> `, // <div style='color:red'>${failInfo}</div>
type: 'success'
});
cityOptions = []
this.dialogVisible = false;
this.$store.commit('layout/delcachePageName', 'cxyrd');
setTimeout(() => {
this.$router.push('/cxyrd')
}, 20);
if (successBarcode.length > 0) {
cityOptions = []
this.dialogVisible = false;
this.$store.commit('layout/delcachePageName', 'cxyrd');
setTimeout(() => {
this.$router.push('/cxyrd')
}, 20);
} else {
}
} else {
this.$message.error(response.data.message);
}
......
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/SystemManage/GroupManage.vue
......@@ -772,7 +772,7 @@ export default {
searchUser() {
let self = this;
this.$axios
.get("/system/roles")
.get("/security/roles")
.then((res) => {
if (res.data.code == 200 && res.data.detail.length > 0) {
let result = res.data.detail;
......@@ -943,7 +943,7 @@ export default {
this.$refs.addFormParams.validate((valid) => {
if (valid) {
this.$axios
.post("/system/user-groups", this.addFormParams)
.post("/security/user-groups", this.addFormParams)
.then((res) => {
if (res.data.code == 201) {
setTimeout(() => {
......@@ -974,7 +974,7 @@ export default {
console.info(valid);
if (valid) {
this.$axios
.put("/system/user-groups", this.editFormParams)
.put("/security/user-groups", this.editFormParams)
.then((res) => {
if (res.data.code == 200) {
setTimeout(() => {
......@@ -1030,7 +1030,7 @@ export default {
// 搜索
search() {
console.info("搜索用户列表");
this.$axios.get("/system/user-groups").then((res) => {
this.$axios.get("/security/user-groups").then((res) => {
if (res.data.code == "200") {
this.tableData = res.data.detail;
}
......
src/views/SystemManage/PermissionManage.vue
......@@ -652,7 +652,7 @@ export default {
// 获取用户信息
searchUser() {
console.info("搜索用户列表");
this.$axios.get("/system/users").then((res) => {
this.$axios.get("/security/users").then((res) => {
if (res.data.code == 200) {
this.userTableData = res.data.detail;
}
......@@ -692,7 +692,7 @@ export default {
// 获取用户组信息
searchGroup() {
this.$axios.get("/system/user-groups").then((res) => {
this.$axios.get("/security/user-groups").then((res) => {
if (res.data.code == 200) {
this.groupTableData = res.data.detail;
}
......
src/views/SystemManage/RoleManage.vue
......@@ -401,7 +401,7 @@ export default {
methods: {
// 获取权限列表
getPermissionDataLists() {
this.$axios.get("/system/permissions").then((res) => {
this.$axios.get("/security/permissions").then((res) => {
if (res.data.code == 200 && res.data.detail.length > 0) {
let result = res.data.detail;
var arr = [];
......@@ -490,7 +490,7 @@ export default {
}
this.$axios({
method: "post",
url: "/system/roles",
url: "/security/roles",
headers: {
"Content-Type": "application/json;charset=UTF-8",
},
......@@ -516,7 +516,7 @@ export default {
// 获取角色列表 和 角色权限列表
search() {
this.$axios
.get("/system/roles")
.get("/security/roles")
.then((res) => {
if (res.data.code == "200" && res.data.detail.length > 0) {
let result = res.data.detail;
......
src/views/SystemManage/UserManage.vue
......@@ -738,7 +738,7 @@ export default {
console.log(valid);
if (valid) {
this.$axios
.post("/system/users", this.addFormParams)
.post("/security/users", this.addFormParams)
.then((res) => {
if (res.data.code == 201) {
setTimeout(() => {
......@@ -785,7 +785,7 @@ export default {
this.$refs.editFormParams.validate((valid) => {
console.log(valid);
if (valid) {
this.$axios.put("/system/users", this.editFormParams).then((res) => {
this.$axios.put("/security/users", this.editFormParams).then((res) => {
if (res.data.code == 200) {
setTimeout(() => {
this.$message.success("修改成功");
......@@ -827,7 +827,7 @@ export default {
},
search() {
console.info("搜索用户列表");
this.$axios.get("/system/users").then((res) => {
this.$axios.get("/security/users").then((res) => {
if (res.data.code == 200) {
this.tableData = res.data.detail;
}
......@@ -893,7 +893,7 @@ export default {
// 人员信息
getPersonInfor(id) {
this.loading = true;
this.$axios.get("/system/users/" + id, { loading: false }).then((res) => {
this.$axios.get("/security/users/" + id, { loading: false }).then((res) => {
this.loading = false;
if (res.data) {
let result = res.data;
......
src/views/SystemManage/UserPermission.vue
......@@ -408,7 +408,7 @@ export default {
},
personInfor() {
let self = this;
this.$axios.get("/system/users/" + this.userID).then((res) => {
this.$axios.get("/security/users/" + this.userID).then((res) => {
if (res.data) {
let result = res.data;
if (result.status == "1") {
......@@ -529,7 +529,7 @@ export default {
// 获取权限列表
getPermissionDataLists() {
this.$axios.get("/system/permissions").then((res) => {
this.$axios.get("/security/permissions").then((res) => {
if (res.data.code == 200 && res.data.detail.length > 0) {
let result = res.data.detail;
var arr = [];
......
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>
src/views/drFPTX/RAList.vue
......@@ -198,8 +198,8 @@
class="btn"
@click="isShowTjddlBtn"
>添加到队列</div>
<div class="btn">复制入库失败编号</div>
<div class="btn">复制入库成功编号</div>
<!-- <div class="btn">复制入库失败编号</div>
<div class="btn">复制入库成功编号</div> -->
<div
class="btn"
v-clipboard:copy="copyNum"
......@@ -533,16 +533,17 @@
<el-tooltip
class="item"
effect="dark"
content="复制数据"
content="复制"
placement="top"
:open-delay="500"
@click="handleClick(scope.row)"
>
<div
class="icon bz"
@click="isShowFztmBtn(scope.row)"
class="icon bj"
@click="handleClick(scope.row)"
>
<img
src="../../assets/img/qbryk/bz.svg"
src="../../assets/img/qbryk/fz.svg"
alt=""
/>
</div>
......@@ -564,6 +565,20 @@
/>
</div>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="人工认定"
placement="top"
:open-delay="500"
>
<div class="icon look">
<img
src="../../assets/img/qbryk/rgrd.svg"
alt=""
/>
</div>
</el-tooltip>
</div>
</template>
</el-table-column>
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-25 10:23:03
* @LastEditTime: 2021-11-25 10:25:19
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -115,9 +115,19 @@ module.exports = {
"^/login": ""
}
},
// "/system": {
// target: "http://192.168.128.106:8765/security", // 湖南-王
// // target: "http://www.meetfood.cn:2390/system", // 湖南-王
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// "^/system": ""
// }
// },
"/security": {
// target: "http://192.168.128.106:8765/security", // 湖南-王
target: "http://www.meetfood.cn:2390/security", // 湖南-王
target: "http://192.168.128.106:8765", // 湖南-王
// target: "http://www.meetfood.cn:2390/system", // 湖南-王
ws: true,
changeOrigin: true,
pathRewrite: {
......
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