Skip to content

F
founder_vue
Commit 8eaf333d by 张超军
Options

分页器，批量搜索，三角，副中心点，指位

parent 350cef3a
Showing with 1199 additions and 309 deletions
dist.zip 0 → 100644
File added
package-lock.json deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
......@@ -22,12 +22,13 @@
"element-ui": "2.15.6",
"file-saver": "^2.0.5",
"google-protobuf": "^3.19.1",
"gsap": "^3.10.4",
"gsap": "^3.11.1",
"html2canvas": "^1.3.2",
"js-base64": "^3.7.2",
"js-cookie": "^2.2.1",
"js-md5": "^0.7.3",
"jszip": "^3.7.1",
"jspdf": "^2.5.1",
"jszip": "^3.10.1",
"jwt-decode": "^3.1.2",
"lib-flexible": "^0.3.2",
"moment": "^2.29.1",
......@@ -35,6 +36,7 @@
"ol": "^6.9.0",
"pinyin-match": "^1.2.2",
"postcss-px2rem": "^0.3.0",
"print-js": "^1.6.0",
"px2rem": "^0.5.0",
"px2rem-loader": "^0.1.9",
"qs": "^6.9.4",
......@@ -51,7 +53,8 @@
"vue-simple-uploader": "^0.7.6",
"vue-wechat-title": "^2.0.7",
"vuex": "^3.4.0",
"vuex-persistedstate": "^4.0.0-beta.1"
"vuex-persistedstate": "^4.0.0-beta.1",
"xlsx": "^0.18.5"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.5.0",
......
public/iconfont/demo_index.html
......@@ -3,8 +3,8 @@
<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="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
<link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.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">
......@@ -55,6 +55,12 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe694;</span>
<div class="name">模板导入</div>
<div class="code-name">&amp;#xe694;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe600;</span>
<div class="name">关闭</div>
<div class="code-name">&amp;#xe600;</div>
......@@ -498,9 +504,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1654508777262') format('woff2'),
url('iconfont.woff?t=1654508777262') format('woff'),
url('iconfont.ttf?t=1654508777262') format('truetype');
src: url('iconfont.woff2?t=1662025662479') format('woff2'),
url('iconfont.woff?t=1662025662479') format('woff'),
url('iconfont.ttf?t=1662025662479') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -527,6 +533,15 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-mobandaoru"></span>
<div class="name">
模板导入
</div>
<div class="code-name">.icon-mobandaoru
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-guanbi"></span>
<div class="name">
关闭
......@@ -1194,6 +1209,14 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-mobandaoru"></use>
</svg>
<div class="name">模板导入</div>
<div class="code-name">#icon-mobandaoru</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-guanbi"></use>
</svg>
<div class="name">关闭</div>
......
public/iconfont/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 2961960 */
src: url('iconfont.woff2?t=1654508777262') format('woff2'),
url('iconfont.woff?t=1654508777262') format('woff'),
url('iconfont.ttf?t=1654508777262') format('truetype');
src: url('iconfont.woff2?t=1662025662479') format('woff2'),
url('iconfont.woff?t=1662025662479') format('woff'),
url('iconfont.ttf?t=1662025662479') format('truetype');
}
.iconfont {
......@@ -13,6 +13,10 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-mobandaoru:before {
content: "\e694";
}
.icon-guanbi:before {
content: "\e600";
}
......
public/iconfont/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
public/iconfont/iconfont.json
......@@ -6,6 +6,13 @@
"description": "",
"glyphs": [
{
"icon_id": "22427566",
"name": "模板导入",
"font_class": "mobandaoru",
"unicode": "e694",
"unicode_decimal": 59028
},
{
"icon_id": "9303783",
"name": "关闭",
"font_class": "guanbi",
......
src/assets/css/globalBase.scss
/deep/ .el-input__inner {
.filter /deep/ .el-input__inner {
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03);
border-radius: 4px;
border: none;
}
// 输入框选中样式
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus {
.filter /deep/.el-input.is-active .el-input__inner,
.filter /deep/.el-input__inner:focus {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
border-color: transparent !important;
color: #055fe7;
}
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:hover {
.filter /deep/.el-input.is-active .el-input__inner,
.filter /deep/.el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
border-color: transparent !important;
}
// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus-within {
.filter /deep/.el-input.is-active .el-input__inner,
.filter /deep/.el-input__inner:focus-within {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
border-color: transparent !important;
color: #055fe7;
.el-range-input {
color: #055fe7;
}
}
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:hover {
.filter /deep/.el-input.is-active .el-input__inner,
.filter /deep/.el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
border-color: transparent !important;
}
/deep/.el-table td,
......@@ -206,17 +206,17 @@
/deep/.btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
// /deep/ .el-pagination__sizes {
// position: absolute;
// right: 0;
// }
// 修改下拉框样式
.el-select-dropdown__item {
padding-left: 10px !important;
}
/deep/.el-input__inner:hover {
.filter /deep/.el-input__inner:hover {
cursor: text;
}
......
src/assets/img/rybj/hfrktz.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 67</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-67">
<g id="编组-13备份-3" transform="translate(11.500000, 13.000000) rotate(-336.000000) translate(-11.500000, -13.000000) translate(8.000000, 6.000000)">
<path d="M3.3791649,6.00740425 C3.74185038,6.00740425 4.05279225,6.13679509 4.11807562,6.31502738 L4.13009042,6.3825544 L4.13009042,12.765734 C4.13009042,12.765734 2.62823936,12.765734 2.62823936,12.765734 L2.62823936,6.3825544 C2.62823936,6.1753647 2.96444019,6.00740425 3.3791649,6.00740425 Z" id="形状" fill="#FFAA00" fill-rule="nonzero" transform="translate(3.379165, 9.386569) rotate(-360.000000) translate(-3.379165, -9.386569) "></path>
<path d="M3.37916489,13.5166596 C3.79388961,13.5166596 4.13009042,13.1804587 4.13009042,12.765734 C4.13009042,12.3510093 3.79388961,12.0148085 3.37916489,12.0148085 C2.96444017,12.0148085 2.62823936,12.3510093 2.62823936,12.765734 C2.62823936,13.1804587 2.96444017,13.5166596 3.37916489,13.5166596 Z" id="椭圆形" fill="#FFAA00" transform="translate(3.379165, 12.765734) rotate(-360.000000) translate(-3.379165, -12.765734) "></path>
<path d="M0,3.37916491 C0,5.24542613 1.51290365,6.75832978 3.37916489,6.75832978 C5.24542612,6.75832978 6.75832978,5.24542613 6.75832978,3.37916491 C6.75832978,2.17190557 6.11426461,1.05635193 5.06874735,0.452722256 C4.02323008,-0.150907419 2.73509969,-0.150907419 1.68958243,0.452722256 C0.644065167,1.05635193 0,2.17190557 0,3.37916491 Z" id="路径" fill="#FFAA00" fill-rule="nonzero" transform="translate(3.379165, 3.379165) rotate(-360.000000) translate(-3.379165, -3.379165) "></path>
<path d="M3.00370212,2.62823936 C3.00370212,3.25032644 3.50800334,3.75462765 4.13009042,3.75462765 C4.7521775,3.75462765 5.25647871,3.25032644 5.25647871,2.62823936 C5.25647871,2.00615228 4.7521775,1.50185106 4.13009042,1.50185106 C3.50800334,1.50185106 3.00370212,2.00615228 3.00370212,2.62823936 Z" id="路径" fill="#FFFFFF" fill-rule="nonzero" transform="translate(4.130090, 2.628239) rotate(-360.000000) translate(-4.130090, -2.628239) "></path>
</g>
<path d="M1.25991421,9.23817259 C1.44057299,9.25798427 1.60505335,9.32590995 1.74526615,9.42496831 L5.29845893,10.9791297 C5.84582804,11.2168697 6.1073788,11.8734849 5.88088123,12.4480232 C5.67056207,12.9829381 5.11510376,13.2574712 4.60009144,13.1018081 L4.48144986,13.0593545 L2.15242248,12.0401081 C2.28993887,15.4477144 4.05877699,18.6232413 6.9708885,20.3893097 C11.5871246,23.1855847 17.4895432,21.5270653 20.153586,16.6816981 C20.45019,16.1439529 21.105415,15.9599875 21.617731,16.2684834 C22.1300469,16.5798096 22.3053128,17.2675574 22.0114053,17.8053025 C18.756851,23.7289904 11.5439822,25.7582709 5.90041787,22.3393436 C1.80189054,19.8543947 -0.444210314,15.0826137 0.0734984274,10.2315861 C0.14090841,9.61176399 0.672099127,9.16741666 1.25991421,9.23817259 Z M18.0990702,1.65999195 C22.2001648,4.14409753 24.4461948,8.91708852 23.9258061,13.7692993 C23.8583983,14.3860818 23.3299206,14.8302783 22.7394277,14.7623757 C22.553382,14.7397414 22.3835141,14.6690095 22.2406095,14.5643262 L18.7010637,13.0194248 C18.1537118,12.7817655 17.8921693,12.1253732 18.1186597,11.5510298 C18.3289723,11.0162964 18.8844131,10.7418565 19.3994092,10.8974668 L19.518047,10.9399059 L21.8469475,11.9585617 C21.7094355,8.55211172 19.9406531,5.37766247 17.0286333,3.61219336 C12.4125426,0.816867265 6.51030987,2.47482383 3.846351,7.31854678 C3.54975639,7.85610948 2.89455193,8.04001251 2.38225215,7.73162128 C1.86995238,7.42040076 1.69469193,6.73288634 1.98859022,6.19532364 C5.24304199,0.270816736 12.4556836,-1.75777516 18.0990702,1.65999195 Z" id="形状" fill="#055FE7" fill-rule="nonzero"></path>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/zcedit/direction.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="114px" height="115px" viewBox="0 0 114 115" 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>编组 7</title>
<desc>Created with Sketch.</desc>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="人员指纹编辑" transform="translate(-1054.000000, -636.000000)" stroke="#07D91D" stroke-width="2">
<g id="编组-7" transform="translate(1054.000000, 636.000000)">
<line x1="0" y1="113.5" x2="114" y2="113.5" id="路径-8备份-2"></line>
<line x1="56.5" y1="0" x2="56.5" y2="114" id="路径-8备份-3"></line>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/zcedit/douxing.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="31px" height="31px" viewBox="0 0 31 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 4</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="人员指纹编辑" transform="translate(-1356.000000, -314.000000)">
<g id="编组-4" transform="translate(1357.400000, 315.400000)">
<path d="M14.1037037,24.0592593 C19.6020052,24.0592593 24.0592593,19.6020052 24.0592593,14.1037037 C24.0592593,8.60540219 19.6020052,4.14814815 14.1037037,4.14814815 C8.60540219,4.14814815 4.14814815,8.60540219 4.14814815,14.1037037 C4.14814815,19.6020052 8.60540219,24.0592593 14.1037037,24.0592593 Z" id="椭圆形备份-4" stroke="#055FE7" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="22.4,11.2"></path>
<path d="M14.1037037,24.0592593 C19.6020052,24.0592593 24.0592593,19.6020052 24.0592593,14.1037037 C24.0592593,8.60540219 19.6020052,4.14814815 14.1037037,4.14814815 C8.60540219,4.14814815 4.14814815,8.60540219 4.14814815,14.1037037 C4.14814815,19.6020052 8.60540219,24.0592593 14.1037037,24.0592593 Z" id="椭圆形备份-4" stroke="#055FE7" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="22.4,11.2" transform="translate(14.103704, 14.103704) rotate(-330.000000) translate(-14.103704, -14.103704) "></path>
<path d="M14.1037037,19.9111111 C17.3110463,19.9111111 19.9111111,17.3110463 19.9111111,14.1037037 C19.9111111,10.8963612 17.3110463,8.2962963 14.1037037,8.2962963 C10.8963612,8.2962963 8.2962963,10.8963612 8.2962963,14.1037037 C8.2962963,17.3110463 10.8963612,19.9111111 14.1037037,19.9111111 Z" id="椭圆形备份-5" stroke="#E02020" stroke-width="1.6" stroke-linecap="round" stroke-dasharray="30.4,3.2" transform="translate(14.103704, 14.103704) rotate(-105.000000) translate(-14.103704, -14.103704) "></path>
<circle id="椭圆形" fill="#E02020" opacity="0.5" cx="14.1037037" cy="14.1037037" r="2.48888889"></circle>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/zcedit/gongxing.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 7</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="人员指纹编辑" transform="translate(-1357.000000, -249.000000)">
<g id="编组-7" transform="translate(1357.000000, 249.000000)">
<rect id="矩形" x="0" y="0" width="27.2" height="27.2"></rect>
<g id="编组-3" transform="translate(4.000000, 5.600000)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
<path d="M19.2,16.7797096 C17.6824912,6.79629698 13.9569069,0 9.60154025,0 C5.24322364,0 1.5155427,6.80550668 0,16.8" id="椭圆形" stroke="#055FE7"></path>
<path d="M14.4,14.3893717 C13.6412456,9.15996508 11.7784534,5.6 9.60077012,5.6 C7.42161182,5.6 5.55777135,9.16478921 4.8,14.4" id="椭圆形备份-3" stroke="#F44739"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/zcedit/selected-delete.svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1662361075243" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3430" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M385.47911111 902.59911111h83.74044444v41.41511111h-83.74044444zM217.99822222 902.59911111h83.74044445v41.41511111h-83.74044445zM113.55022222 881.89155555h-41.41511111v62.12266667H134.25777778v-41.41511111h-20.70755556zM72.13511111 546.816h41.41511111v83.74044445h-41.41511111zM72.13511111 211.85422222h41.41511111v83.74044445h-41.41511111zM72.13511111 714.41066667h41.41511111v83.74044444h-41.41511111zM72.13511111 379.33511111h41.41511111V463.07555555h-41.41511111zM72.13511111 128.11377778h41.41511111v-20.70755556H134.25777778V65.99111111h-62.12266667zM553.07377778 65.99111111h83.74044444v41.41511111h-83.74044444zM720.55466667 65.99111111h83.74044444v41.41511111h-83.74044444zM385.47911111 65.99111111h83.74044444v41.41511111h-83.74044444zM217.99822222 65.99111111h83.74044445v41.41511111h-83.74044445zM888.03555555 65.99111111v41.41511111h20.70755556v20.70755556h41.41511111V65.99111111zM908.74311111 379.33511111h41.41511111V463.07555555h-41.41511111zM908.74311111 211.85422222h41.41511111v83.74044445h-41.41511111zM738.75911111 637.26933333l70.08711111-54.272c5.23377778-4.096 8.07822222-10.46755555 7.50933333-17.06666666-0.56888889-6.59911111-4.43733333-12.51555555-10.24-15.58755556L451.47022222 359.424c-6.82666667-3.64088889-15.13244445-2.95822222-21.27644444 1.70666667-6.144 4.77866667-8.87466667 12.62933333-7.05422223 20.13866666l95.91466667 391.168c1.59288889 6.48533333 6.25777778 11.60533333 12.51555556 13.76711112 6.25777778 2.16177778 13.19822222 1.024 18.432-2.95822223l70.08711111-54.272 151.552 195.69777778c3.86844445 5.00622222 9.67111111 7.62311111 15.47377778 7.62311111 4.20977778 0 8.41955555-1.36533333 11.94666666-4.096l87.60888889-67.81155556c4.096-3.18577778 6.82666667-7.85066667 7.39555556-12.97066666 0.68266667-5.12-0.79644445-10.35377778-3.98222223-14.44977778l-151.32444444-195.69777778z" p-id="3431" data-spm-anchor-id="a313x.7781069.0.i0" class="" fill="#ff0080"></path></svg>
\ No newline at end of file
src/assets/img/zcedit/youji.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="29px" height="29px" viewBox="0 0 29 29" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 6备份</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="人员指纹编辑" transform="translate(-1406.000000, -249.000000)">
<g id="编组-6备份" transform="translate(1420.100000, 263.400000) scale(-1, 1) translate(-1420.100000, -263.400000) translate(1406.100000, 249.400000)">
<rect id="矩形" x="0" y="0" width="27.2" height="27.2"></rect>
<g id="编组-2备份" transform="translate(13.473205, 14.073205) scale(-1, 1) rotate(-330.000000) translate(-13.473205, -14.073205) translate(8.473205, 3.073205)">
<path d="M0,21.2 L0,8 L0,4.8 C-3.24649801e-16,2.1490332 2.1490332,4.86974701e-16 4.8,0 C7.4509668,-4.86974701e-16 9.6,2.1490332 9.6,4.8 L9.6,8.8 L9.6,8.8" id="路径-37" stroke="#307AEB" stroke-width="1.6" stroke-linecap="round"></path>
<line x1="9.6" y1="12" x2="9.6" y2="16.8" id="路径-40" stroke="#307AEB" stroke-width="1.6" stroke-linecap="round"></line>
<path d="M4.22913558,4.76998014 L4.23370249,4.88432956 C4.2496867,5.3394629 4.25882053,5.79572842 4.26110399,6.25199393 C4.26110399,6.69127686 4.25082843,14.2581007 4.22685212,14.5366152 C4.1469311,15.4627323 2.74032117,15.1400631 2.80311626,14.4154727 C2.82252565,14.1856417 2.83165948,6.65391516 2.83165948,6.25199393 C2.83051775,5.812711 2.82252565,5.37342808 2.80539971,4.93414515 L2.8008328,4.81073835 L2.8008328,4.78130186 C2.8008328,3.68649106 3.69594821,2.8 4.8,2.8 C5.90405179,2.8 6.79802547,3.68649106 6.7991672,4.78130186 L6.7991672,17.3638902 C6.7991672,17.7544897 6.47948313,18.071498 6.08558668,18.071498 C5.69169023,18.071498 5.37200615,17.7544897 5.37200615,17.3638902 L5.37200615,4.78130186 C5.37086442,4.46882225 5.11511716,4.21521562 4.8,4.21521562 C4.48944976,4.21521562 4.23598595,4.46202922 4.22913558,4.76998014 Z" id="路径" fill="#E02020" fill-rule="nonzero" transform="translate(4.800000, 10.435749) scale(-1, 1) translate(-4.800000, -10.435749) "></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/zcedit/zaxing.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="29px" height="29px" viewBox="0 0 29 29" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 2</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="人员指纹编辑" transform="translate(-1406.000000, -315.000000)">
<g id="编组-2" transform="translate(1406.400000, 315.400000)">
<rect id="矩形" x="0" y="0" width="27.2" height="27.2"></rect>
<g id="编组-5" transform="translate(3.200000, 3.200000)">
<circle id="椭圆形备份-12" fill="#055FE7" cx="1.2" cy="4.4" r="1.2"></circle>
<circle id="椭圆形备份-24" fill="#055FE7" cx="1.2" cy="7.6" r="1.2"></circle>
<circle id="椭圆形备份-31" fill="#055FE7" cx="1.2" cy="10.8" r="1.2"></circle>
<circle id="椭圆形备份-38" fill="#055FE7" cx="1.2" cy="14" r="1.2"></circle>
<circle id="椭圆形备份-45" fill="#055FE7" cx="1.2" cy="17.2" r="1.2"></circle>
<circle id="椭圆形备份-6" fill="#055FE7" cx="4.4" cy="1.2" r="1.2"></circle>
<circle id="椭圆形备份-13" fill="#E02020" cx="4.4" cy="4.4" r="1.2"></circle>
<circle id="椭圆形备份-25" fill="#055FE7" cx="4.4" cy="7.6" r="1.2"></circle>
<circle id="椭圆形备份-32" fill="#055FE7" cx="4.4" cy="10.8" r="1.2"></circle>
<circle id="椭圆形备份-39" fill="#055FE7" cx="4.4" cy="14" r="1.2"></circle>
<circle id="椭圆形备份-46" fill="#E02020" cx="4.4" cy="17.2" r="1.2"></circle>
<circle id="椭圆形备份-53" fill="#055FE7" cx="4.4" cy="20.4" r="1.2"></circle>
<circle id="椭圆形备份-7" fill="#055FE7" cx="7.6" cy="1.2" r="1.2"></circle>
<circle id="椭圆形备份-14" fill="#055FE7" cx="7.6" cy="4.4" r="1.2"></circle>
<circle id="椭圆形备份-26" fill="#E02020" cx="7.6" cy="7.6" r="1.2"></circle>
<circle id="椭圆形备份-33" fill="#055FE7" cx="7.6" cy="10.8" r="1.2"></circle>
<circle id="椭圆形备份-40" fill="#E02020" cx="7.6" cy="14" r="1.2"></circle>
<circle id="椭圆形备份-47" fill="#055FE7" cx="7.6" cy="17.2" r="1.2"></circle>
<circle id="椭圆形备份-54" fill="#055FE7" cx="7.6" cy="20.4" r="1.2"></circle>
<circle id="椭圆形备份-8" fill="#055FE7" cx="10.8" cy="1.2" r="1.2"></circle>
<circle id="椭圆形备份-15" fill="#055FE7" cx="10.8" cy="4.4" r="1.2"></circle>
<circle id="椭圆形备份-27" fill="#055FE7" cx="10.8" cy="7.6" r="1.2"></circle>
<circle id="椭圆形备份-34" fill="#E02020" cx="10.8" cy="10.8" r="1.2"></circle>
<circle id="椭圆形备份-41" fill="#055FE7" cx="10.8" cy="14" r="1.2"></circle>
<circle id="椭圆形备份-48" fill="#055FE7" cx="10.8" cy="17.2" r="1.2"></circle>
<circle id="椭圆形备份-55" fill="#055FE7" cx="10.8" cy="20.4" r="1.2"></circle>
<circle id="椭圆形备份-9" fill="#055FE7" cx="14" cy="1.2" r="1.2"></circle>
<circle id="椭圆形备份-16" fill="#055FE7" cx="14" cy="4.4" r="1.2"></circle>
<circle id="椭圆形备份-28" fill="#E02020" cx="14" cy="7.6" r="1.2"></circle>
<circle id="椭圆形备份-35" fill="#055FE7" cx="14" cy="10.8" r="1.2"></circle>
<circle id="椭圆形备份-42" fill="#E02020" cx="14" cy="14" r="1.2"></circle>
<circle id="椭圆形备份-49" fill="#055FE7" cx="14" cy="17.2" r="1.2"></circle>
<circle id="椭圆形备份-56" fill="#055FE7" cx="14" cy="20.4" r="1.2"></circle>
<circle id="椭圆形备份-10" fill="#055FE7" cx="17.2" cy="1.2" r="1.2"></circle>
<circle id="椭圆形备份-17" fill="#E02020" cx="17.2" cy="4.4" r="1.2"></circle>
<circle id="椭圆形备份-29" fill="#055FE7" cx="17.2" cy="7.6" r="1.2"></circle>
<circle id="椭圆形备份-36" fill="#055FE7" cx="17.2" cy="10.8" r="1.2"></circle>
<circle id="椭圆形备份-43" fill="#055FE7" cx="17.2" cy="14" r="1.2"></circle>
<circle id="椭圆形备份-50" fill="#E02020" cx="17.2" cy="17.2" r="1.2"></circle>
<circle id="椭圆形备份-57" fill="#055FE7" cx="17.2" cy="20.4" r="1.2"></circle>
<circle id="椭圆形备份-22" fill="#055FE7" cx="20.4" cy="4.4" r="1.2"></circle>
<circle id="椭圆形备份-30" fill="#055FE7" cx="20.4" cy="7.6" r="1.2"></circle>
<circle id="椭圆形备份-37" fill="#055FE7" cx="20.4" cy="10.8" r="1.2"></circle>
<circle id="椭圆形备份-44" fill="#055FE7" cx="20.4" cy="14" r="1.2"></circle>
<circle id="椭圆形备份-51" fill="#055FE7" cx="20.4" cy="17.2" r="1.2"></circle>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/zcedit/zuoji.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="29px" height="29px" viewBox="0 0 29 29" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 6备份 2</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="人员指纹编辑" transform="translate(-1456.000000, -249.000000)">
<g id="编组-6备份-2" transform="translate(1456.400000, 249.400000)">
<rect id="矩形" x="0" y="0" width="27.2" height="27.2"></rect>
<g id="编组-2备份" transform="translate(13.473205, 14.073205) scale(-1, 1) rotate(-330.000000) translate(-13.473205, -14.073205) translate(8.473205, 3.073205)">
<path d="M0,21.2 L0,8 L0,4.8 C-3.24649801e-16,2.1490332 2.1490332,4.86974701e-16 4.8,0 C7.4509668,-4.86974701e-16 9.6,2.1490332 9.6,4.8 L9.6,8.8 L9.6,8.8" id="路径-37" stroke="#307AEB" stroke-width="1.6" stroke-linecap="round"></path>
<line x1="9.6" y1="12" x2="9.6" y2="16.8" id="路径-40" stroke="#307AEB" stroke-width="1.6" stroke-linecap="round"></line>
<path d="M4.22913558,4.76998014 L4.23370249,4.88432956 C4.2496867,5.3394629 4.25882053,5.79572842 4.26110399,6.25199393 C4.26110399,6.69127686 4.25082843,14.2581007 4.22685212,14.5366152 C4.1469311,15.4627323 2.74032117,15.1400631 2.80311626,14.4154727 C2.82252565,14.1856417 2.83165948,6.65391516 2.83165948,6.25199393 C2.83051775,5.812711 2.82252565,5.37342808 2.80539971,4.93414515 L2.8008328,4.81073835 L2.8008328,4.78130186 C2.8008328,3.68649106 3.69594821,2.8 4.8,2.8 C5.90405179,2.8 6.79802547,3.68649106 6.7991672,4.78130186 L6.7991672,17.3638902 C6.7991672,17.7544897 6.47948313,18.071498 6.08558668,18.071498 C5.69169023,18.071498 5.37200615,17.7544897 5.37200615,17.3638902 L5.37200615,4.78130186 C5.37086442,4.46882225 5.11511716,4.21521562 4.8,4.21521562 C4.48944976,4.21521562 4.23598595,4.46202922 4.22913558,4.76998014 Z" id="路径" fill="#E02020" fill-rule="nonzero" transform="translate(4.800000, 10.435749) scale(-1, 1) translate(-4.800000, -10.435749) "></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/ImageEd.vue
......@@ -324,7 +324,7 @@
<img src="../assets/img/zcedit/features2.svg" alt="">
</div>
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="只显示匹配特征的位置" placement="top" :open-delay="500">
<el-tooltip class="item" effect="dark" content="只显示匹配特征的位置" placement="top" :open-delay="500">
<div class="features features3" :class="{featuresActive: features3}" @click.stop="features3Change">
<img src="../assets/img/zcedit/features3.svg" alt="">
</div>
......@@ -343,7 +343,7 @@
<div class="features features6" :class="{featuresActive: features6}" @click.stop @mousedown.stop="features6Change" @mouseup="features6=false">
<img src="../assets/img/zcedit/features6.svg" alt="">
</div>
</el-tooltip>-->
</el-tooltip>
</div>
<div class="lt_middle_main">
<div class="source" @mousedown="sourceEdit">
......@@ -2583,7 +2583,7 @@ export default {
self.imageEditor.changeCursor("auto");
// 图层恢复
self.imageEditor.rotate(-canvasImage.angle);
self.imageEditor.rotate(-canvasImage.angle || 0);
self.imageEditor.resetZoom();
self.zoomLevel = 1
self.startPlaceSource = 0;
......@@ -3016,6 +3016,94 @@ export default {
// 2 正查
// 3 串查
console.log(this.showType);
// aim 重新对接比对
if (this.showType == '指纹') {
NetUtil.imageEd.fingerComparison({
srcBarcode: barcode_source,
srcSeq: seq_source,
destBarcode: barcode_target,
destSeq: seq_target,
searchType: type
}).then(response => {
console.log(response);
if (response.code === 0) {
if (response.ret.left.length>=0) {
response.ret.left.forEach(item => {
this.bdjqData_source.push({
zwtzd_tzxzb: item.x,
zwtzd_tzyzb: item.y,
zwtzd_tzfx: item.a,
tzppzt: item.tzppzt,
tzppbs: item.tzppbs,
scale: 1
})
})
}
if (response.ret.right.length>=0) {
response.ret.right.forEach(item => {
this.bdjqData_target.push({
zwtzd_tzxzb: item.x,
zwtzd_tzyzb: item.y,
zwtzd_tzfx: item.a,
tzppzt: item.tzppzt,
tzppbs: item.tzppbs,
scale: 1
})
})
}
this.pptzxzjd = -response.ret.pptzxzjd
} else {
this.bdjqData_source = []
this.bdjqData_target = []
this.pptzxzjd = 0
}
})
} else {
NetUtil.imageEd.palmComparison({
srcBarcode: barcode_source,
srcSeq: seq_source,
destBarcode: barcode_target,
destSeq: seq_target,
searchType: type
}).then(response => {
console.log(response);
if (response.code === 0) {
if (response.ret.left.length>=0) {
response.ret.left.forEach(item => {
this.bdjqData_source.push({
zwtzd_tzxzb: item.x,
zwtzd_tzyzb: item.y,
zwtzd_tzfx: item.a,
tzppzt: item.tzppzt,
tzppbs: item.tzppbs,
scale: this.ratio_tzd_source + 0.2
})
})
console.log(this.bdjqData_source);
}
if (response.ret.right.length>=0) {
response.ret.right.forEach(item => {
this.bdjqData_target.push({
zwtzd_tzxzb: item.x,
zwtzd_tzyzb: item.y,
zwtzd_tzfx: item.a,
tzppzt: item.tzppzt,
tzppbs: item.tzppbs,
scale: this.ratio_tzd_source + 0.2
})
})
}
this.pptzxzjd = -response.ret.pptzxzjd
} else {
this.bdjqData_source = []
this.bdjqData_target = []
this.pptzxzjd = 0
}
})
}
/*
if (this.showType == '指纹') {
if (type == 1 || type == 2) {
NetUtil.imageEd.fingerTZD({
......@@ -3279,6 +3367,7 @@ export default {
})
}
}
*/
// 因为$bus.emit的组件并未被销毁，在方法结束后结束$bus事件，防止接口多次调用
// this.$bus.off('target_info')
......
src/main.js
......@@ -50,6 +50,9 @@ Vue.prototype.$moment = moment
window.moment = moment
// 引入上传组件
import uploader from 'vue-simple-uploader'
// 打印
import htmlToPdf from './utils/htmlToPDF.js'
Vue.use(htmlToPdf)
//全局水印
import { setWaterMark } from '@/utils/watermark'
......
src/netmgr/imageEd/imageEd.js
......@@ -16,7 +16,11 @@ const _path = {
fingerTZD_LL: addrType.api + '/export/trait/ll/finger',
// 获取图片特征 -- 正/倒查 -- 掌纹
handTZD: addrType.api + '/export/trait/lt/palm',
handTZD_LL: addrType.api + '/export/trait/ll/palm'
handTZD_LL: addrType.api + '/export/trait/ll/palm',
// 指纹比对
fingerComparison: addrType.api + '/export/trait/comparison',
// 掌纹比对
palmComparison: addrType.api + '/export/trait/comparisonPalm',
}
export default {
// 获取图片特征
......@@ -32,4 +36,12 @@ export default {
handTZD_LL(_parameter) {
return fHttp.postJson(_path.handTZD_LL, _parameter, HttpConfigUtil.closeLoadAndTip())
},
// 指纹比对
fingerComparison(_parameter) {
return fHttp.postJson(_path.fingerComparison, _parameter, HttpConfigUtil.closeLoadAndTip())
},
// 掌纹比对
palmComparison(_parameter) {
return fHttp.postJson(_path.palmComparison, _parameter, HttpConfigUtil.closeLoadAndTip())
}
}
src/router/modules/index.js
......@@ -257,6 +257,15 @@ export default [
component: () => import("@/views/rgrd/rgTL.vue")
},
{
path: "/print/:rybh",
name: "print",
meta: {
title: '打印',
auth: "5"
},
component: () => import("@/views/dy/rymb.vue")
},
{
path: "/fingerprintIndex/:rybh/:username",
name: "fingerprint",
meta: {
......
src/utils/htmlToPDF.js 0 → 100644
// htmlToPdf.js
// 导出页面为PDF格式
import html2Canvas from 'html2canvas'
import JsPDF from 'jspdf'
export default {
install (Vue, options) {
Vue.prototype.getPdf = function () {
var title = this.htmlTitle //DPF标题
html2Canvas(document.querySelector('#pdfDom'), {
allowTaint: true,
taintTest: false,
useCORS: true,
y: 1, // 对Y轴进行裁切
// width:1200,
// height:5000,
// width: 1240,
// height: 3508,
dpi: window.devicePixelRatio * 4, //将分辨率提高到特定的DPI 提高四倍
scale: 4 //按比例增加分辨率
}).then(function (canvas) {
let contentWidth = canvas.width
let contentHeight = canvas.height
let pageHeight = contentWidth / 592.28 * 841.89
let leftHeight = contentHeight
let position = 0
let imgWidth = 595.28
let imgHeight = 592.28 / contentWidth * contentHeight
let pageData = canvas.toDataURL('image/jpeg', 1.0)
let PDF = new JsPDF('', 'pt', 'a4')
if (leftHeight < pageHeight) {
PDF.addImage(pageData, 'JPEG', 0, 0, imgWidth, imgHeight)
} else {
while (leftHeight > 0) {
PDF.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
leftHeight -= pageHeight
position -= 841.89
if (leftHeight > 0) {
PDF.addPage()
}
}
}
PDF.save(title + '.pdf')
})
}
}
}
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -29,6 +29,20 @@
></div>
</div>
<div class="search-right">
<el-tooltip
class="item"
effect="dark"
content="批量搜素"
placement="top"
>
<div class="dr">
<el-button
class="drBtn"
@click="isShowDrBtn"
><span class="iconfont">&#xe694;</span></el-button>
</div>
</el-tooltip>
<div class="rksj">
<span class="create-time-text">入库时间:</span>&nbsp;&nbsp;
<el-date-picker
......@@ -411,17 +425,21 @@
<span class="iconfont">&#xe605;</span>
</div>
</el-tooltip>-->
<!-- <el-tooltip
<el-tooltip
class="item"
effect="dark"
content="打印"
placement="top"
v-if="roleArr.includes('F-1-17')"
:open-delay="500"
>
<div class="icon-div">
<div
class="icon-div"
@click="print(scope.row)"
>
<span class="iconfont">&#xe606;</span>
</div>
</el-tooltip> -->
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
......@@ -468,14 +486,15 @@
size
}}页</span>
<el-pagination
class="paging"
class="paging"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="reqParam.page.currPage"
:page-sizes="[10, 20, 30, 40]"
background
layout="prev, pager, next"
:page-sizes="[10, 20, 50, 100, 200]"
:page-size="reqParam.page.pageSize"
layout="sizes, prev, pager, next"
:total="reqParam.page.total"
background
>
</el-pagination>
<!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40]" background layout="sizes, prev, pager, next" :total="tableDataLength">
......@@ -535,17 +554,14 @@
@closeRyxxk="closeRyxxk"
>
</ryxxk>
<!-- <el-drawer
title="我是标题"
:visible.sync="drawer"
:direction="direction"
:before-close="handleClose"
:with-header="false"
:modal='false'
>
<span>我来啦!</span>
</el-drawer> -->
<!-- 导入 -->
<dr
:isShowDr="isShowDr"
:type="type"
@closeDr="closeDr"
@drTmh='drTmh'
>
</dr>
</div>
</el-container>
</template>
......@@ -559,6 +575,7 @@ import ggrytm from './modules/ggrytm.vue' // 更改人员条码弹窗
import fcx from './modules/fcx.vue' // 发查询弹窗
import xzry from './modules/xzry.vue' // 新增案件
import ryxxk from './modules/ryxxk.vue' // 人员信息卡
import dr from './modules/dr.vue' // 导入
export default {
name: 'AllPersonnelBase',
components: {
......@@ -569,7 +586,8 @@ export default {
ggrytm,
fcx,
xzry,
ryxxk
ryxxk,
dr
},
created () {
let w1 = 1920
......@@ -599,6 +617,7 @@ export default {
isShowFcx: false, //发查询
isShowXzry: false, // 新增人员
isShowRyxxk: false, // 人员信息卡
isShowDr: false,// 导入
type: 'ry', // 人员还是案件
rowData: {}, // 单行数据
ysxtAsjxgrybh: null,
......@@ -921,6 +940,19 @@ export default {
//console.log("导出FPTX关闭", val);
this.isShowDcftpx = val
},
// 导入
isShowDrBtn() {
this.isShowDr = true
},
closeDr(val) {
this.$bus.emit('isBlur', val)
this.isShowDr = val
},
drTmh(val) {
this.reqParam.personStoreCustomSearch.ysxtAsjxgrybh = val
this.search()
this.$message.success('文件中的数据已筛选到当前页面列表中')
},
// 关注
isShowGzBtn () {
// 多行
......@@ -1012,7 +1044,12 @@ export default {
this.search()
}
},
// 打印
print (val) {
this.$router.pushToTab({
path: `/print/` + val.ysxtAsjxgrybh
})
},
//发查询操作(多行)
isShowFcxBtn () {
if (this.multipleSelection.length === 0) {
......@@ -1156,7 +1193,7 @@ export default {
*/
handleSizeChange (pageSize) {
this.reqParam.page.pageSize = pageSize
//console.log("每页条数", this.reqParam.page.pageSize);
this.search()
},
/**
* @description: currentPage 改变时会触发
......@@ -1340,6 +1377,13 @@ export default {
background-color: #dadde0;
border-radius: 3px;
}
/deep/ .el-input__clear {
line-height: 32px;
}
/deep/ .el-date-editor .el-range__close-icon {
line-height: 28px;
}
.AllPersonnelBase {
height: 100%;
......@@ -1366,26 +1410,105 @@ export default {
.search-right {
display: flex;
align-items: center;
.el-date-editor--daterange.el-input,
.el-date-editor--daterange.el-input__inner,
.el-date-editor--timerange.el-input,
.el-date-editor--timerange.el-input__inner {
width: 250px;
height: 32px;
}
// /deep/.el-date-editor {
// padding-right: 5px;
// }
.create-time-text {
font-size: 14px;
color: #606266;
}
.rksj {
.dr {
margin-right: 30px;
.drBtn {
width: 40px;
height: 40px;
background: #3a88ff;
border-radius: 0 4px 4px 0;
border: none;
color: #fff;
cursor: pointer;
&:hover {
background: #377fec;
}
span {
cursor: pointer;
}
.iconfont {
color: #fff;
}
}
}
.rksj {
margin-right: 10px;
}
.xm {
margin-right: 30px;
margin-right: 10px;
.el-input {
width: 150px;
height: 32px;
}
/deep/ .el-input__inner {
width: 150px;
height: 32px;
}
}
.sfzh {
margin-right: 10px;
.el-input {
width: 180px;
width: 220px;
height: 32px;
}
/deep/.el-input__inner {
width: 180px;
/deep/ .el-input__inner {
width: 220px;
height: 32px;
}
}
.ljfk {
display: flex;
align-items: center;
margin-right: 15px;
width: 190px;
/deep/ .el-input.el-input--suffix {
width: 120px;
height: 32px;
}
/deep/ .el-input--suffix .el-input__inner {
height: 32px;
}
/deep/ .el-input__icon {
line-height: 32px;
}
}
}
.right {
width: 175px;
flex: 1;
display: flex;
justify-content: flex-end;
align-items: center;
......@@ -1432,14 +1555,12 @@ export default {
width: 40px;
height: 40px;
background: #055fe7;
border-radius: 0px 4px 4px 0px;
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
font-size: 14px;
color: #fff;
margin-right: 48px;
&:hover {
background: #377fec;
......@@ -1722,10 +1843,6 @@ export default {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
}
/deep/ .el-table th {
......
src/views/AllPersonnelBase/dclb.vue
......@@ -406,9 +406,9 @@
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"
:current-page="currPage1"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 50, 100, 200]"
background
layout="prev, pager, next"
layout="sizes, prev, pager, next"
:total="total1"
>
</el-pagination>
......@@ -423,9 +423,9 @@
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"
:current-page="currPage2"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 50, 100, 200]"
background
layout="prev, pager, next"
layout="sizes, prev, pager, next"
:total="total2"
>
</el-pagination>
......@@ -715,6 +715,7 @@ export default {
*/
handleSizeChange1 (pageSize) {
this.pageSize = pageSize;
this.search()
//console.log("每页条数", this.pageSize);
},
/**
......@@ -734,6 +735,7 @@ export default {
*/
handleSizeChange2 (pageSize) {
this.pageSize = pageSize;
this.search()
//console.log("每页条数", this.pageSize);
},
/**
......@@ -1073,10 +1075,6 @@ export default {
/deep/.btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
}
/deep/.el-table th {
background-color: #f6f8fa;
......
src/views/AllPersonnelBase/gzlb.vue
......@@ -604,13 +604,13 @@
>
<span class="record">共{{ total1 }}条记录 第{{ currPage1 }}/{{size}}页</span>
<el-pagination
class="paging"
class="paging"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"
:current-page="currPage1"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 50, 100, 200]"
background
layout="prev, pager, next"
layout="sizes, prev, pager, next"
:total="total1"
>
</el-pagination>
......@@ -621,13 +621,13 @@
>
<span class="record">共{{ total2 }}条记录 第{{ currPage2 }}/{{size}}页</span>
<el-pagination
class="paging"
class="paging"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"
:current-page="currPage2"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 50, 100, 200]"
background
layout="prev, pager, next"
layout="sizes, prev, pager, next"
:total="total2"
>
</el-pagination>
......@@ -850,7 +850,7 @@ export default {
personLogicIds: ''
},
page: {
pageSize: 10,
pageSize: this.pageSize,
currPage: 1
}
}
......@@ -876,7 +876,7 @@ export default {
caseLogicIds: ''
},
page: {
pageSize: 10,
pageSize: this.pageSize,
currPage: 1
}
}
......@@ -1294,7 +1294,7 @@ export default {
*/
handleSizeChange1 (pageSize) {
this.pageSize = pageSize
//console.log("每页条数", this.pageSize);
this.search()
},
/**
* @description: currentPage 改变时会触发
......@@ -1312,7 +1312,7 @@ export default {
*/
handleSizeChange2 (pageSize) {
this.pageSize = pageSize
//console.log("每页条数", this.pageSize);
this.search()
},
/**
* @description: currentPage 改变时会触发
......@@ -1754,11 +1754,6 @@ export default {
/deep/ .btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
}
/deep/ .el-table th {
......
src/views/AllPersonnelBase/modules/dr.vue 0 → 100644
<template>
<el-dialog
:title="title"
:visible.sync="dialogVisible"
:width="width"
append-to-body
:before-close="handleClose"
:close-on-click-modal="false"
:modal="false"
>
<div class="drContent">
<div class="bgcDiv">
<div class="center">
<el-input readonly placeholder="只能上传txt文件" style="cursor: inherit;"> </el-input>
<div class="line"></div>
<div class="text" @click="uploadFile">选择</div>
<!-- 上传 -->
<el-upload
class="upload-demo"
ref="upload"
action="https://jsonplaceholder.typicode.com/posts/"
:multiple="false"
:on-change="onChange"
:file-list="fileList"
:auto-upload="false"
:show-file-list="false"
accept=".txt"
>
</el-upload>
</div>
</div>
<div class="tipDiv">文件中共有{{ existList.length + notExistList.length }}条数据</div>
<div class="content">
<div class="contentHalf">
<div class="head">
系统中成功匹配 <span class="left">{{ existList.length }}</span> 条已有数据
</div>
<div class="bottom">
<div v-for="(item, i) in existList" :key="'existList' + i" class="item">
<span class="itemId">{{ (i+1) < 10 ? "0"+ (i+1):(i+1)}}</span>
<span class="itemContent">{{ item }}</span>
</div>
</div>
</div>
<div class="contentHalf">
<div class="head">
其中有 <span class="right">{{ notExistList.length }}</span> 条数据尚不存在
</div>
<div class="bottom">
<div v-for="(item, i) in notExistList" :key="'notExistList' + i" class="item">
<span class="itemId">{{ (i+1) < 10 ? "0"+ (i+1):(i+1)}}</span>
<span class="itemContent">{{ item }}</span>
</div>
</div>
</div>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button class="confirmBtn" @click="handleDr">导 入</el-button>
<el-button class="cancelBtn" type="primary" @click="handleClose">取 消</el-button>
</span>
</el-dialog>
</template>
<script>
export default {
name: 'dr',
props: {
isShowDr: {
type: Boolean,
default: false,
},
type: {
default: false,
},
},
data() {
return {
width: '900px',
title: '',
dialogVisible: false, // 弹窗状态
fileList: [],
existList: [],
notExistList: [],
}
},
mounted() {
this.dialogVisible = this.isShowDr
// this.type == 'ry' ? this.width = '900px' : this.width = '1081px'
this.type == 'ry' ? (this.title = '导入人员条码号文件') : (this.title = '导入案件条码号文件')
},
watch: {
isShowDr(newVal) {
console.log(newVal);
this.dialogVisible = newVal
},
dialogVisible() {
this.fileList = []
this.existList = []
this.notExistList = []
this.$emit('closeDr', this.dialogVisible)
},
},
methods: {
uploadFile() {
this.$refs['upload'].$children[0].$refs.input.click()
},
handleDr() {
if (this.existList.length == 0) {
this.$message.error('当前数据库中没有文件中的数据')
} else {
this.$emit('drTmh', this.existList.toString())
this.dialogVisible = false
}
},
handleClose() {
this.dialogVisible = false
},
onChange(file, fileList) {
console.log(file, fileList)
let formData = new FormData()
formData.append('file', file.raw)
if (this.type == 'ry') {
let arr = this.$store.state.ljk.targetOptions_ry
let idArrs = []
for (let i = 0; i < arr.length; i++) {
idArrs.push(arr[i].id)
}
formData.append('logicIds', idArrs.toString())
formData.append('queryType', 'person')
} else if (this.type == 'aj') {
let arr = this.$store.state.ljk.targetOptions_aj
let idArrs = []
for (let i = 0; i < arr.length; i++) {
idArrs.push(arr[i].id)
}
formData.append('logicIds', idArrs.toString())
formData.append('queryType', 'case')
}
this.$axios({
method: 'POST',
url: '/api/personstore/searchExistBarcode',
headers: {
'Content-Type': 'multipart/form-data',
},
data: formData,
}).then((res) => {
console.log(res)
this.existList = res.data.ret.existList
this.notExistList = res.data.ret.notExistList
})
},
},
}
</script>
<style lang="scss" scoped>
:deep(.el-dialog__footer) {
text-align: center;
.confirmBtn,
.cancelBtn {
width: 72px;
height: 40px;
}
.confirmBtn {
background-color: #fff;
color: #333333;
}
}
:deep(.el-button + .el-button) {
margin-left: 24px;
}
:deep(.el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner) {
border-color: #055fe7;
background: #055fe7;
}
:deep(.el-checkbox__input.is-checked + .el-checkbox__label) {
color: #333333;
}
:deep(.el-button--primary) {
border-color: #055fe7;
background: #055fe7;
}
.drContent {
width: 100%;
padding: 30px 20px;
.bgcDiv {
width: 363px;
height: 60px;
border-radius: 4px;
padding: 10px 10px 10px 10px;
background-color: #f6f8fa;
}
:deep(.el-input__inner:hover) {
cursor: inherit;
box-shadow: none;
}
.center {
display: flex;
align-items: center;
width: 343px;
background: #ffffff;
border-radius: 4px;
&:hover {
box-shadow: 0 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
}
&:focus-within {
box-shadow: 0 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
:deep(.el-input__inner) {
color: #006aff !important;
}
}
/deep/ .el-input {
width: 282px;
height: 40px;
/deep/ .el-input__inner {
border: none;
outline: none;
box-shadow: none;
&:focus {
box-shadow: none;
}
}
/deep/ .el-input__inner:hover {
cursor: inherit;
box-shadow: none;
}
}
.line {
width: 1px;
height: 14px;
background-color: #e6e6e8;
margin-right: 14px;
}
.text {
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #006aff;
cursor: pointer;
}
.text:hover {
color: #51b1f5;
}
}
:deep(.el-input__inner) {
border: none;
}
.tipDiv {
margin: 10px 0;
}
.content {
width: 100%;
height: 400px;
display: flex;
.contentHalf {
flex: 1;
height: 100%;
padding: 10px;
.head {
font-size: 16px;
font-family: HarmonyOS_Sans_SC;
.left {
color: #00b47a;
}
.right {
color: #fe0000;
}
}
.bottom {
height: 350px;
overflow: auto;
}
.item {
line-height: 35px;
font-family: HarmonyOS_Sans_SC;
font-size: 14px;
.itemId {
margin-right: 20px;
}
}
}
}
}
:deep(.el-dialog__body) {
padding: 0;
}
:deep(.el-dialog) {
border-radius: 6px;
}
:deep(.el-dialog__header) {
border-bottom: 1px solid #eee;
padding: 15px 20px 8px;
}
:deep(.el-dialog__title) {
font-size: 16px;
}
:deep(.el-dialog) {
border-radius: 6px;
font-family: HarmonyOS_Sans_SC;
}
</style>
src/views/AllPersonnelBase/qbalk.vue
......@@ -27,6 +27,19 @@
></div>
</div>
<div class="search-right">
<el-tooltip
class="item"
effect="dark"
content="批量导入"
placement="top"
>
<div class="dr">
<el-button
class="drBtn"
@click="isShowDrBtn"
> <span class="iconfont">&#xe694;</span></el-button>
</div>
</el-tooltip>
<span class="create-time-text">入库时间:</span>&nbsp;&nbsp;
<el-date-picker
v-model="reqParam.caseStoreCustomSearchReq.createTime"
......@@ -412,9 +425,9 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="reqParam.page.currPage"
:page-sizes="[3, 6, 9, 20, 50, 100, 500]"
:page-sizes="[10, 20, 50, 100, 200]"
:page-size="reqParam.page.pageSize"
layout="prev, pager, next"
layout="sizes, prev, pager, next"
:total="reqParam.page.total"
background
>
......@@ -477,7 +490,14 @@
:rowData="rowData"
@closeAjxxk="closeAjxxk"
></ajxxk>
<!-- 导入 -->
<dr
:isShowDr="isShowDr"
:type="type"
@closeDr="closeDr"
@drTmh="drTmh"
>
</dr>
</div>
</el-container>
</template>
......@@ -491,6 +511,7 @@ import dcftpx from './modules/dcftpx.vue' //导出FTPX弹窗
import ggrytm from './modules/ggrytm.vue'// 更改人员条码弹窗
import fcx from './modules/fcx.vue' // 发查询弹窗
import xzaj from './modules/xzaj.vue'// 新增案件
import dr from './modules/dr.vue' // 导入
import ajxxk from './modules/ajxxk.vue'// 案件信息卡
export default {
name: 'qbalk',
......@@ -503,7 +524,8 @@ export default {
ggrytm,
fcx,
xzaj,
ajxxk
ajxxk,
dr
},
created () {
let w1 = 1920
......@@ -532,6 +554,7 @@ export default {
isShowFztm: false, //复制条码
isShowFcx: false, //发查询
isShowXzaj: false, // 新增案件
isShowDr: false,// 导入
type: 'aj', // 人员还是案件
reqParam: {
caseStoreCustomSearchReq: {
......@@ -817,6 +840,19 @@ export default {
console.log('添加到队列关闭', val)
this.isShowTjddl = val
},
// 导入
isShowDrBtn () {
this.isShowDr = true
},
closeDr (val) {
this.$bus.emit('isBlur', val)
this.isShowDr = val
},
drTmh (val) {
this.reqParam.caseStoreCustomSearchReq.ysxtAsjbh = val
this.search()
this.$message.success(this.$t('dr.wjsjsxcg'))
},
// 关注
isShowGzBtn () { // 多行
console.log('关注')
......@@ -998,7 +1034,6 @@ export default {
handleSizeChange (pageSize) {
this.reqParam.page.pageSize = pageSize
this.search()
console.log(pageSize)
},
/**
* @description: currentPage 改变时会触发
......@@ -1006,9 +1041,7 @@ export default {
* @return {*}
*/
handleCurrentChange (page) {
this.search(page)
console.log(page)
},
/**
* @description: 清除所有选项
......@@ -1193,6 +1226,14 @@ const datas1 = [
border-radius: 3px;
}
/deep/ .el-input__clear {
line-height: 32px;
}
/deep/ .el-date-editor .el-range__close-icon {
line-height: 28px;
}
.delSelection /deep/ .el-table-column--selection .cell {
display: none;
}
......@@ -1223,17 +1264,61 @@ const datas1 = [
}
.search-right {
display: flex;
align-items: center;
.dr {
margin-right: 30px;
// margin-top: 1px;
.drBtn {
width: 40px;
height: 40px;
background: #3a88ff;
border-radius: 0 4px 4px 0;
border: none;
color: #fff;
cursor: pointer;
&:hover {
background: #377fec;
}
span {
cursor: pointer;
}
.iconfont {
color: #fff;
}
}
}
.rksj {
display: flex;
line-height: 40px;
margin-right: 24px;
}
.ljfk {
display: flex;
line-height: 40px;
}
.create-time-text {
font-size: 14px;
color: #606266;
}
.el-date-editor--daterange.el-input,
.el-date-editor--daterange.el-input__inner,
.el-date-editor--timerange.el-input,
.el-date-editor--timerange.el-input__inner {
width: 250px;
height: 32px;
}
}
.right {
width: 830px;
flex: 1;
display: flex;
justify-content: flex-end;
align-items: center;
// margin-right: 24px;
/deep/ .sx {
width: 72px;
height: 32px;
......@@ -1297,14 +1382,12 @@ const datas1 = [
width: 40px;
height: 40px;
background: #055fe7;
border-radius: 0px 4px 4px 0px;
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
font-size: 14px;
color: #fff;
margin-right: 48px;
&:hover {
background: #377fec;
......@@ -1565,10 +1648,6 @@ const datas1 = [
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
}
/deep/ .el-table th {
......
src/views/Editor/modules/imageEd.scss
......@@ -939,6 +939,85 @@ $previewHeight: var(--previewHeight, 100%);
background: #07d91d;
}
}
.fingerPattern {
z-index: 9999;
position: absolute;
right: 8px;
top: 16px;
width: 162px;
height: 175px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #e6e6e8;
.fingerPattern-title {
width: 100%;
height: 32px;
background: #f6f8fa;
line-height: 32px;
padding-left: 15px;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #333333;
}
.fingerPattern-content {
width: 100%;
height: 143px;
padding: 12px;
display: flex;
flex-wrap: wrap;
.fingerPattern-item {
cursor: pointer;
height: 60px;
width: 32px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
margin-right: 18px;
margin-bottom: 5px;
.fingerPattern-item-img {
width: 32px;
height: 32px;
display: flex;
justify-content: center;
align-items: center;
background: #ffffff;
box-shadow: 0px 2px 4px 0px rgba(5, 95, 231, 0.5), inset 0px 0px 3px 0px rgba(5, 95, 231, 0.15);
border-radius: 3px;
img {
object-fit: contain;
}
}
.fingerPattern-item-name {
margin-top: 5px;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #666666;
}
}
.fingerPattern-item.isActive {
.fingerPattern-item-img {
width: 32px;
height: 32px;
background: #E9F3FD;
box-shadow: inset 1px 1px 3px 0px rgba(5,95,231,0.5);
border-radius: 3px;
display: flex;
justify-content: center;
align-items: center;
img {
object-fit: contain;
}
}
.fingerPattern-item-name {
margin-top: 5px;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #333333;
}
}
}
}
.drawing {
overflow: hidden;
// width: 880px;
......@@ -1085,6 +1164,11 @@ $previewHeight: var(--previewHeight, 100%);
width: 50px;
height: 60px;
}
.viceCenterPoint {
position: absolute;
width: 50px;
height: 50px;
}
}
.tzdDrawing_2 {
width: 780px;
......@@ -1179,7 +1263,7 @@ $previewHeight: var(--previewHeight, 100%);
.options-top {
position: relative;
width: 336px;
height: 184px;
height: 238px;
background: #f6f8fa;
box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.25);
border-radius: 4px;
......@@ -1296,13 +1380,16 @@ $previewHeight: var(--previewHeight, 100%);
align-items: center;
padding: 0 16px;
position: relative;
.bz {
margin-top: 10px;
margin-right: 20px;
}
.zyhz {
cursor: pointer;
width: 64px;
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);
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;
align-items: center;
......@@ -1348,8 +1435,7 @@ $previewHeight: var(--previewHeight, 100%);
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);
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;
......@@ -1373,9 +1459,6 @@ $previewHeight: var(--previewHeight, 100%);
color: #ffffff;
}
}
.tzd.bz {
margin-left: 10px;
}
// .tzd-d {
// position: relative;
......@@ -1388,6 +1471,9 @@ $previewHeight: var(--previewHeight, 100%);
// cursor: pointer;
// }
// }
.mouse-delete {
margin-left: 20px;
}
.bzd {
margin-left: 20px;
cursor: pointer;
......@@ -1435,8 +1521,7 @@ $previewHeight: var(--previewHeight, 100%);
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);
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;
align-items: center;
......@@ -1445,6 +1530,12 @@ $previewHeight: var(--previewHeight, 100%);
cursor: pointer;
}
}
.dp-hfrktz {
.hfrktz {
width: 26px;
height: 26px;
}
}
}
.xstz,
.xszyqy {
......@@ -1492,8 +1583,7 @@ $previewHeight: var(--previewHeight, 100%);
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);
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;
......@@ -1598,7 +1688,7 @@ $previewHeight: var(--previewHeight, 100%);
&:hover {
// border: 1px solid #055fe7;
transform: scale(1.15);
transition: transform .2s linear;
transition: transform 0.2s linear;
}
}
.qbzwtz {
......@@ -1670,7 +1760,7 @@ $previewHeight: var(--previewHeight, 100%);
position: relative;
margin-top: 16px;
width: 336px;
height: 588px;
height: 534px;
background: #f6f8fa;
box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.25);
border-radius: 4px;
......@@ -1703,15 +1793,13 @@ $previewHeight: var(--previewHeight, 100%);
width: 64px;
height: 32px;
background: #f6f8fa;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8),
-4px -4px 4px 0px #ffffff;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #ffffff;
border-radius: 4px;
margin-right: 12px;
margin-bottom: 16px;
&:active {
background: #055fe7;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8),
-4px -4px 4px 0px #ffffff;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #ffffff;
color: #ffffff;
}
}
......@@ -1719,6 +1807,7 @@ $previewHeight: var(--previewHeight, 100%);
.vintageActive,
.horseshoeMirrorActive,
.equalizationActive,
.HistogramActive,
.sharpenActive,
.embossActive,
.invertActive,
......@@ -1728,8 +1817,7 @@ $previewHeight: var(--previewHeight, 100%);
.blendActive,
.brightnessActive {
background: #055fe7;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8),
-4px -4px 4px 0px #ffffff;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #ffffff;
color: #ffffff;
}
.blend {
......
src/views/SystemManage/GroupManage.vue
......@@ -329,9 +329,9 @@
@size-change="handleSizeChange"
@current-change="handleCurrPageChange"
:current-page="searchParams.page"
:page-sizes="[10, 20, 50, 100]"
:page-sizes="[10, 20, 50, 100, 200]"
:page-size="searchParams.size"
layout="prev, pager, next"
layout="sizes, prev, pager, next"
:total="total"
>
</el-pagination>
......@@ -1785,7 +1785,7 @@ export default {
let params = {}
if (boo) {
this.$set(this.searchParams, 'page', 1)
this.$set(this.searchParams, 'size', 10)
// this.$set(this.searchParams, 'size', 10)
}
for (let key in this.searchParams) {
if (key == 'groupRole' || key == 'userGroupName') {
......
src/views/SystemManage/PermissionManage.vue
......@@ -250,7 +250,8 @@
@current-change="userHandleCurrPageChange"
:current-page="userSearchParams.page"
:page-size="userSearchParams.size"
layout="prev, pager, next"
:page-sizes="[10, 20, 50, 100, 200]"
layout="sizes, prev, pager, next"
:total="userTotal"
>
</el-pagination>
......@@ -488,7 +489,8 @@
@current-change="groupHandleCurrPageChange"
:current-page="groupSearchParams.page"
:page-size="groupSearchParams.size"
layout="prev, pager, next"
:page-sizes="[10, 20, 50, 100, 200]"
layout="sizes, prev, pager, next"
:total="groupTotal"
>
</el-pagination>
......@@ -890,7 +892,7 @@ export default {
let params = {};
if (boo) {
this.$set(this.userSearchParams, "page", 1);
this.$set(this.userSearchParams, "size", 10);
// this.$set(this.userSearchParams, "size", 10);
}
for (let key in this.userSearchParams) {
if (key == "userGroupId" || key == "roleId" || key == "permissionId") {
......@@ -943,7 +945,7 @@ export default {
let params = {};
if (boo) {
this.$set(this.groupSearchParams, "page", 1);
this.$set(this.groupSearchParams, "size", 10);
// this.$set(this.groupSearchParams, "size", 10);
}
for (let key in this.groupSearchParams) {
console.log(key);
......
src/views/SystemManage/scss/group.scss
......@@ -349,13 +349,6 @@
/deep/ .btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
/deep/ .btn-next {
//margin-right: 120px !important;
}
}
.el-table /deep/ {
.is-checked {
......
src/views/SystemManage/scss/permission.scss
......@@ -216,13 +216,6 @@
/deep/ .btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
/deep/ .btn-next {
//margin-right: 120px !important;
}
}
}
.pRight {
......@@ -401,13 +394,6 @@
/deep/ .btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
/deep/ .btn-next {
//margin-right: 120px !important;
}
}
}
......
src/views/SystemManage/scss/user.scss
......@@ -289,13 +289,6 @@
/deep/ .btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
/deep/ .btn-next {
//margin-right: 120px !important;
}
}
.el-table /deep/ {
.is-checked {
......
src/views/SystemManage/systemLog.vue
......@@ -101,9 +101,9 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="systemLogParam.currPage"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 50, 100, 200]"
background
layout="prev, pager, next"
layout="sizes, prev, pager, next"
:total="systemLogParam.total"
>
</el-pagination>
......@@ -223,9 +223,9 @@ export default {
}
},
// pageSize 改变时会触发
handleSizeChange (pageSize) {
this.systemLogParam.pageSize = pageSize;
//console.log("每页条数", this.reqParam.page.pageSize);
handleSizeChange(pageSize) {
this.systemLogParam.pageSize = pageSize
this.getLogList()
},
// currentPage 改变时会触发
handleCurrentChange (page) {
......@@ -307,10 +307,6 @@ export default {
/deep/.btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
}
@import "@/assets/css/globalBase.scss";
</style>
......
src/views/bzxxgl/bzxxsh.vue
......@@ -15,7 +15,7 @@
:rules="rules"
ref="ruleForm"
label-width="6.25rem"
class="demo-ruleForm"
class="demo-ruleForm filter"
>
<div class="cxtj-row1">
<el-form-item
......@@ -508,15 +508,8 @@
<span class="record">共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{
totalPage
}}页</span>
<el-pagination
class="paging"
@current-change="handleCurrentChange"
:current-page="currPage"
:page-sizes="[10, 20, 30, 40]"
background
layout="prev, pager, next"
:total="total"
>
<el-pagination class="paging" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currPage"
:page-sizes="[10, 20, 50, 100, 200]" background layout="sizes, prev, pager, next" :total="total">
</el-pagination>
</div>
</div>
......@@ -968,6 +961,14 @@ export default {
_that.clearSelection()
}
},
/**
* @description: pageSize 改变时会触发
* @param {*} pageSize 每页条数
* @return {*}
*/
handleSizeChange (pageSize) {
this.getData(1, pageSize)
},
handleCurrentChange (page) {
var _that = this
_that.getData(page)
......
src/views/bzxxgl/scss/bzxxfh.scss
......@@ -409,10 +409,6 @@ $tableHeight: var(--tableHeight, 33rem);
cursor: pointer;
}
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 6px; // 横向滚动条
......
src/views/bzxxgl/scss/bzxxsh.scss
......@@ -470,11 +470,6 @@ $tableHeight: var(--tableHeight, 450px);
}
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 6px; // 横向滚动条
......
src/views/bzxxgl/scss/bzxxsh_backup_2022.01.12.scss
......@@ -470,11 +470,6 @@ $tableHeight: var(--tableHeight, 450px);
}
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 6px; // 横向滚动条
......
src/views/cxyrd/QueryConfirm.vue
......@@ -4,12 +4,12 @@
<div class="width100 margin_top24_bottom24" style="display: flex; align-items: center; position: relative">
<div class="display_style">
<span class="labelFont">条码号：</span>
<el-input maxlength="23" show-word-limit clearable class="el_input tmh"
<el-input maxlength="23" show-word-limit clearable class="el_input tmh filter"
v-model="reqParam.contrastCustomSearchReq.barcode" placeholder="请输入条码号"></el-input>
</div>
<div class="display_style">
<span class="labelFont">用户名：</span>
<el-select filterable class="el_select" v-model="reqParam.contrastCustomSearchReq.userid"
<el-select filterable class="el_select filter" v-model="reqParam.contrastCustomSearchReq.userid"
@change="selectUserInfo" clearable @clear="clearUser">
<el-option v-for="(item, index) in userOption" :key="index" :label="item.label" :value="item.userid">
</el-option>
......@@ -17,15 +17,15 @@
</div>
<div class="display_style">
<span class="labelFont">查询ID：</span>
<el-input class="el_input" placeholder="请输入查询ID" v-model="reqParam.contrastCustomSearchReq.qqid" clearable>
<el-input class="el_input filter" placeholder="请输入查询ID" v-model="reqParam.contrastCustomSearchReq.qqid" clearable>
</el-input>
</div>
<div class="display_style">
<span class="labelFont">任务号：</span>
<el-input class="el_input" placeholder="请输入任务号" v-model="reqParam.contrastCustomSearchReq.qid" clearable>
<el-input class="el_input filter" placeholder="请输入任务号" v-model="reqParam.contrastCustomSearchReq.qid" clearable>
</el-input>
</div>
<div class="display_style send_time" style="display: flex; align-items: center">
<div class="display_style send_time filter" style="display: flex; align-items: center">
<span class="labelFont">发送时间：</span>
<el-date-picker v-model="startEndDate" style="display: flex; align-items: center" class="el_data_picker"
type="daterange" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" :picker-options="{
......@@ -150,7 +150,7 @@
</div>
<div class="display_style confirm_main_button">
<div>
<el-select v-model="refreshTime" placeholder="请选择" class="refresh-time" @change="refreshChange">
<el-select v-model="refreshTime" placeholder="请选择" class="refresh-time filter" @change="refreshChange">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
......@@ -334,9 +334,17 @@
<span class="count">共{{ reqParam.page.total }} 条记录 第{{ reqParam.page.currPage }}/{{
size
}}页</span>
<el-pagination class="paging" background @size-change="handleSizeChange" @current-change="handleCurrPageChange"
:current-page="reqParam.page.currPage" :page-sizes="[10, 20, 50, 100]" :page-size="reqParam.page.pageSize"
layout="prev, pager, next" :total="reqParam.page.total">
<el-pagination
class="paging"
background
@size-change="handleSizeChange"
@current-change="handleCurrPageChange"
:current-page="reqParam.page.currPage"
:page-sizes="[10, 20, 50, 100, 200]"
:page-size="reqParam.page.pageSize"
layout="sizes, prev, pager, next"
:total="reqParam.page.total"
>
</el-pagination>
</div>
......@@ -1353,11 +1361,6 @@ const setQueryClass = [
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
/deep/ .btn-next {
//margin-right: 120px !important;
}
......@@ -1472,7 +1475,7 @@ const setQueryClass = [
color: #333333;
}
/deep/ .el-input__inner {
.filter /deep/ .el-input__inner {
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03);
border-radius: 4px;
......@@ -1480,22 +1483,22 @@ const setQueryClass = [
}
// 输入框选中样式
/deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:focus {
.filter /deep/ .el-input.is-active .el-input__inner,
.filter /deep/ .el-input__inner:focus {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
color: #055fe7;
}
/deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:hover {
.filter /deep/ .el-input.is-active .el-input__inner,
.filter /deep/ .el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
}
// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效
/deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:focus-within {
.filter /deep/ .el-input.is-active .el-input__inner,
.filter /deep/ .el-input__inner:focus-within {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
color: #055fe7;
......@@ -1505,8 +1508,8 @@ const setQueryClass = [
}
}
/deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:hover {
.filter /deep/ .el-input.is-active .el-input__inner,
.filter /deep/ .el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
}
......@@ -1794,7 +1797,7 @@ b {
width: 300px;
}
/deep/ .el-input__inner {
.filter /deep/ .el-input__inner {
height: 32px !important;
}
......
src/views/drFPTX/Index.vue
......@@ -888,7 +888,7 @@ export default {
let barcode = this.result.match(reg)
if (barcode == null) {
newlist = []
fileList.pop()
that.fileList.pop()
that.$message.error(that.$t('FptxDr.check_type_same'))
} else {
if (barcode.length == 1) {
......@@ -944,7 +944,7 @@ export default {
let barcode = this.result.match(reg)
if (barcode == null) {
newlist = []
fileList.pop()
that.fileList.pop()
that.$message.error(that.$t('FptxDr.check_type_same'))
} else {
if (barcode.length == 1) {
......@@ -1019,7 +1019,7 @@ export default {
if (regType == null) {
that.$message.error(that.$t('FptxDr.check_type_same'))
newlist = []
fileList.pop()
that.fileList.pop()
} else {
if (regType != '' && regType != null && regType != undefined && regType == '1') { // TL 倒查 1
that.action = '/api/upload/hitresult'
......
src/views/drFPTX/RAList.vue
......@@ -788,9 +788,9 @@
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"
:current-page="currPage1"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 50, 100, 200]"
background
layout="prev, pager, next"
layout="sizes, prev, pager, next"
:total="total1"
>
</el-pagination>
......@@ -805,9 +805,9 @@
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"
:current-page="currPage2"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 50, 100, 200]"
background
layout="prev, pager, next"
layout="sizes, prev, pager, next"
:total="total2"
>
</el-pagination>
......@@ -1736,8 +1736,8 @@ export default {
* @return {*}
*/
handleSizeChange1 (pageSize) {
this.pageSize = pageSize;
//console.log("每页条数", this.pageSize);
this.pageSize = pageSize
this.search()
},
/**
* @description: currentPage 改变时会触发
......@@ -1754,8 +1754,8 @@ export default {
* @return {*}
*/
handleSizeChange2 (pageSize) {
this.pageSize = pageSize;
//console.log("每页条数", this.pageSize);
this.pageSize = pageSize
this.search()
},
/**
* @description: currentPage 改变时会触发
......@@ -2154,10 +2154,6 @@ export default {
/deep/.btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
}
/deep/.el-table th {
background-color: #f6f8fa;
......
src/views/login/modules/AccountsLogin.vue
<template>
<!-- <div class="login_account width70 middle" v-show="isShow">
<!-- <div class="login_account width70 middle" v-show="isShow">
<el-input class="width100 margin_top25_bottom10" type="text" :placeholder="$t('Login.username_placeholder')" @keydown.enter.native="login(userInfo)" v-model="userInfo.username">
<i slot="prefix" style="display: flex; align-items: center">
<img style="
......@@ -20,7 +20,7 @@
</el-input>
<el-button class="login_button width100 margin_top25_bottom10" type="primary" ref="userLogin" @click="login(userInfo)" :loading="btnLoading">{{$t('Login.login_btn')}}
</el-button>
</div>-->
</div> -->
<!-- 对接线上 -->
<div class="AccountsLogin">
<div class="el-icon-loading"></div>
......@@ -33,7 +33,6 @@ import qs from 'qs'
import { Encrypt } from '../../../utils/AESUtils'
import zzwxtCloud from '../../../api/zzwxtCloud.js'
import removeCookie from '@/utils/removeCookie'
import { log } from 'util'
export default {
name: 'AccountsLogin',
......
src/views/xtfkgl/AjXtljfkView.vue
......@@ -241,15 +241,8 @@
<div class="footer">
<span class="count">共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{totalPage}}页</span>
<div class="page">
<el-pagination
class="paging"
@current-change="handleCurrentChange"
:current-page="currPage"
:page-size="pageSize"
background
layout="prev, pager, next"
:total="total"
>
<el-pagination class="paging" @current-change="handleCurrentChange" @size-change="handleSizeChange" :current-page="currPage"
:page-size="pageSize" :page-sizes="[10, 20, 50, 100, 200]" background layout="sizes, prev, pager, next" :total="total">
</el-pagination>
</div>
</div>
......@@ -273,7 +266,7 @@ export default {
tableDate: [],
currPage: 1, // 当前页数
pageSize: 13, // 每页的数据条数
pageSize: 10, // 每页的数据条数
total: 0, // 数据总条数
totalPage: 0, // 总共页数
curMoreYhViewIndex: -1,
......@@ -433,7 +426,15 @@ export default {
}
return newArr
},
/**
* @function handleSizeChange
* @param {Number} val 目标页数量
* @example 每页展示数量发生变化
*/
handleSizeChange (val) {
this.pageSize = val
this.getList()
},
handleCurrentChange (page) {
var _that = this
_that.getList(page)
......
src/views/xtfkgl/RyXtljfkView.vue
......@@ -248,15 +248,8 @@
<div class="footer">
<span class="count">共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{totalPage}}页</span>
<div class="page">
<el-pagination
class="paging"
@current-change="handleCurrentChange"
:current-page="currPage"
:page-size="pageSize"
background
layout="prev, pager, next"
:total="total"
>
<el-pagination class="paging" @current-change="handleCurrentChange" @size-change="handleSizeChange" :current-page="currPage"
:page-size="pageSize" :page-sizes="[10, 20, 50, 100, 200]" background layout="sizes, prev, pager, next" :total="total">
</el-pagination>
</div>
</div>
......@@ -280,7 +273,7 @@ export default {
tableDate: [],
currPage: 1, // 当前页数
pageSize: 13, // 每页的数据条数
pageSize: 10, // 每页的数据条数
total: 0, // 数据总条数
totalPage: 0, // 总共页数
curMoreYhViewIndex: -1,
......@@ -441,7 +434,15 @@ export default {
}
return newArr
},
/**
* @function handleSizeChange
* @param {Number} val 目标页数量
* @example 每页展示数量发生变化
*/
handleSizeChange (val) {
this.pageSize = val
this.getList()
},
handleCurrentChange (page) {
var _that = this
_that.getList(page)
......
src/views/xtfkgl/scss/xtfkgl_main.scss
......@@ -271,15 +271,6 @@
/deep/ .btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
/deep/ .btn-next {
//margin-right: 120px !important;
}
}
}
......
src/views/zljc/Index.vue
......@@ -12,6 +12,7 @@
:label="$t('Common.rybh')+'：'"
>
<el-input
class="filter"
v-model.trim="formInline.barcode"
:placeholder="$t('Common.rybh_placeholder')"
@keyup.enter.native="search()"
......@@ -25,6 +26,7 @@
:label="$t('Zljc.check_result_select')+'：'"
>
<el-select
class="filter"
v-model="formInline.inspectionFlag"
:placeholder="$t('Zljc.select_check_result')"
clearable
......@@ -49,7 +51,7 @@
</el-select>
</el-form-item>
<el-form-item
class="w156"
class="w156 filter"
:label="$t('Common.nydw')+'：'"
>
<Cascader
......@@ -60,7 +62,7 @@
></Cascader>
</el-form-item>
<el-form-item
class="w256"
class="w256 filter"
:label="$t('Common.nyrq')+'：'"
>
<el-date-picker
......@@ -287,16 +289,8 @@
</div>
<div class="footer">
<span class="record">{{$t('Common.all')}}&nbsp;{{ total }}&nbsp;{{$t('Common.item')}}{{$t('Common.record')}} {{$t('Common.di')}}{{ currPage }}/{{ pages }}{{$t('Common.page')}}</span>
<el-pagination
class="paging"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currPage"
:page-sizes="[10, 20, 30, 40]"
background
layout="prev, pager, next"
:total="total"
>
<el-pagination class="paging" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currPage"
:page-sizes="[10, 20, 50, 100, 200]" background layout="sizes, prev, pager, next" :total="total">
</el-pagination>
</div>
</div>
......@@ -659,8 +653,9 @@ export default {
* @param {*} pageSize 每页条数
* @return {*}
*/
handleSizeChange (pageSize) {
// this.page = pageSize;
handleSizeChange(pageSize) {
this.currentPageSize = pageSize
this.search()
},
/**
* @description: currentPage 改变时会触发
......@@ -668,7 +663,6 @@ export default {
* @return {*}
*/
handleCurrentChange (page) {
this.search(page)
},
onDblclickListener () {
......@@ -1106,11 +1100,6 @@ $tableHeight: var(--tableHeight, 33rem);
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
@import "@/assets/css/globalBase.scss";
</style>
<style scoped lang="scss">
......
src/views/zzwlr/htcj.scss
......@@ -70,7 +70,7 @@
}
}
}
/deep/.el-input {
.filter /deep/.el-input {
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03);
border-radius: 4px;
......@@ -82,14 +82,14 @@
color: #055fe7;
}
}
/deep/.el-input__inner:hover {
.filter /deep/.el-input__inner:hover {
cursor: text;
}
/deep/.el-input__inner:focus {
.filter /deep/.el-input__inner:focus {
border-color: none !important;
color: #055fe7;
}
/deep/.el-input__inner {
.filter /deep/.el-input__inner {
width: 280px;
}
// 日期选择器
......@@ -115,19 +115,19 @@
/deep/.el-date-editor .el-range-separator {
line-height: 26px;
}
/deep/.el-date-editor {
.filter /deep/.el-date-editor {
/deep/.el-range__close-icon {
height: 32px !important;
}
}
/deep/ .el-input__icon.el-range__icon.el-icon-date {
.filter /deep/ .el-input__icon.el-range__icon.el-icon-date {
position: absolute;
right: 6px;
}
// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效著作权归作者所有。
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus-within {
.filter /deep/.el-input.is-active .el-input__inner,
.filter /deep/.el-input__inner:focus-within {
border-color: none !important;
color: #055fe7;
.el-range-input {
......@@ -604,7 +604,3 @@
/deep/.btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
src/views/zzwlr/htcj.vue
......@@ -133,10 +133,12 @@
</div>
<!-- 页码 -->
<div class="block">
<span class="record">{{$t('Common.all')}}{{ liveCollectionTo.total }}{{$t('Common.item')}}{{$t('Common.record')}} {{$t('Common.di')}}{{
liveCollectionTo.currPage
}}/{{ Tpage }}{{$t('Common.page')}}</span>
<el-pagination class="paging" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="liveCollectionTo.currPage" :page-sizes="[10, 20, 30, 40]" background layout="prev, pager, next" :total="liveCollectionTo.total">
<span class="record">{{ $t('Common.all') }}{{ liveCollectionTo.total }}{{ $t('Common.item') }}{{
$t('Common.record') }}
{{ $t('Common.di') }}{{ liveCollectionTo.currPage }}/{{ Tpage }}{{ $t('Common.page') }}</span>
<el-pagination class="paging" @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page="liveCollectionTo.currPage" :page-sizes="[10, 20, 50, 100, 200]" background layout="sizes, prev, pager, next"
:total="liveCollectionTo.total">
</el-pagination>
</div>
</div>
......@@ -419,7 +421,7 @@ export default {
handleSizeChange (pageSize) {
this.liveCollectionTo.pageSize = pageSize
//console.log("每页条数", this.reqParam.page.pageSize);
this.search()
},
handleCurrentChange (page) {
//console.log("当前页", this.reqParam.page.currPage);
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-07-30 23:08:09
* @LastEditTime: 2022-09-07 15:30:50
* @LastEditors: zhangchaojun 893499851@qq.com
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -103,7 +103,10 @@ module.exports = {
// target: "http://172.20.0.149:8099", // 北京 张
// target: "http://192.168.0.109:8099", // 西藏 张
// target: "http://192.168.0.143:8099", // 西藏 马
target: "http://172.18.108.98:8099/", // 张 认定
// target: "http://172.18.108.98:8099/", // 张 认定
// target: "http://192.168.128.102:8090", // 北京 王
// target: "http://172.18.118.53:8099", // 北京
target: "http://172.18.118.53:11099", // 北京
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -119,7 +122,10 @@ module.exports = {
// target: "http://172.18.109.63:8765", // 北京 张
// target: "http://192.168.0.108:8765", // 西藏 马
// target: "http://192.168.0.107:8765", // 西藏 张
target: "http://172.18.108.98:8765/", // 张 认定
// target: "http://172.18.108.98:8765/", // 张 认定
// target: "http://192.168.128.102:8765", // 北京 王
target: "http://172.18.118.53:8765", // 北京
// target: "http://172.18.118.53:11099", // 北京
// target: "http://172.18.110.145:8765", // 马
ws: true,
changeOrigin: true,
......
yarn.lock
......@@ -5009,10 +5009,10 @@
"resolved" "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.4.tgz?cache=0&sync_timestamp=1588103461620&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgraceful-fs%2Fdownload%2Fgraceful-fs-4.2.4.tgz"
"version" "4.2.4"
"gsap@^3.10.4":
"integrity" "sha512-6QatdkKxXCMfvCW4rM++0RqyLQAzFX5nwl3yHS0XPgkZBkiSEY3VZVbMltrdtsbER/xZonLtyHt684wRp4erlQ=="
"resolved" "https://registry.npmmirror.com/gsap/-/gsap-3.10.4.tgz"
"version" "3.10.4"
"gsap@^3.11.1":
"integrity" "sha512-UKuJ0UPhntFHMwT6URFQ4cTQv88xc7Kd9Dhxt7qX9IPhC+d+/a5wKW5E5Vn33hZ53nBI1JfApcEbzKgXkcuPZw=="
"resolved" "https://registry.npmmirror.com/gsap/-/gsap-3.11.1.tgz"
"version" "3.11.1"
"gzip-size@^5.0.0":
"integrity" "sha1-y5vuaS+HwGErIyhAqHOQTkwTUnQ="
......
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