Commit 887e9bea by 米嘉伟

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

parents 3af78cfc e3f4ca8a
...@@ -55,6 +55,18 @@ ...@@ -55,6 +55,18 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont">&#xe639;</span>
<div class="name">审核</div>
<div class="code-name">&amp;#xe639;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe638;</span>
<div class="name">叹号</div>
<div class="code-name">&amp;#xe638;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe637;</span> <span class="icon iconfont">&#xe637;</span>
<div class="name">查询认定</div> <div class="name">查询认定</div>
<div class="code-name">&amp;#xe637;</div> <div class="code-name">&amp;#xe637;</div>
...@@ -318,9 +330,9 @@ ...@@ -318,9 +330,9 @@
<pre><code class="language-css" <pre><code class="language-css"
>@font-face { >@font-face {
font-family: 'iconfont'; font-family: 'iconfont';
src: url('iconfont.woff2?t=1638273661267') format('woff2'), src: url('iconfont.woff2?t=1638362401014') format('woff2'),
url('iconfont.woff?t=1638273661267') format('woff'), url('iconfont.woff?t=1638362401014') format('woff'),
url('iconfont.ttf?t=1638273661267') format('truetype'); url('iconfont.ttf?t=1638362401014') format('truetype');
} }
</code></pre> </code></pre>
<h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3> <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
...@@ -347,6 +359,24 @@ ...@@ -347,6 +359,24 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont icon-shenhe1"></span>
<div class="name">
审核
</div>
<div class="code-name">.icon-shenhe1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-tanhao1"></span>
<div class="name">
叹号
</div>
<div class="code-name">.icon-tanhao1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-chaxunrending"></span> <span class="icon iconfont icon-chaxunrending"></span>
<div class="name"> <div class="name">
查询认定 查询认定
...@@ -744,6 +774,22 @@ ...@@ -744,6 +774,22 @@
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shenhe1"></use>
</svg>
<div class="name">审核</div>
<div class="code-name">#icon-shenhe1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-tanhao1"></use>
</svg>
<div class="name">叹号</div>
<div class="code-name">#icon-tanhao1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-chaxunrending"></use> <use xlink:href="#icon-chaxunrending"></use>
</svg> </svg>
<div class="name">查询认定</div> <div class="name">查询认定</div>
......
@font-face { @font-face {
font-family: "iconfont"; /* Project id 2961960 */ font-family: "iconfont"; /* Project id 2961960 */
src: url('iconfont.woff2?t=1638273661267') format('woff2'), src: url('iconfont.woff2?t=1638362401014') format('woff2'),
url('iconfont.woff?t=1638273661267') format('woff'), url('iconfont.woff?t=1638362401014') format('woff'),
url('iconfont.ttf?t=1638273661267') format('truetype'); url('iconfont.ttf?t=1638362401014') format('truetype');
} }
.iconfont { .iconfont {
...@@ -13,6 +13,14 @@ ...@@ -13,6 +13,14 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-shenhe1:before {
content: "\e639";
}
.icon-tanhao1:before {
content: "\e638";
}
.icon-chaxunrending:before { .icon-chaxunrending:before {
content: "\e637"; content: "\e637";
} }
......
...@@ -6,6 +6,20 @@ ...@@ -6,6 +6,20 @@
"description": "", "description": "",
"glyphs": [ "glyphs": [
{ {
"icon_id": "26156485",
"name": "审核",
"font_class": "shenhe1",
"unicode": "e639",
"unicode_decimal": 58937
},
{
"icon_id": "26156409",
"name": "叹号",
"font_class": "tanhao1",
"unicode": "e638",
"unicode_decimal": 58936
},
{
"icon_id": "26116326", "icon_id": "26116326",
"name": "查询认定", "name": "查询认定",
"font_class": "chaxunrending", "font_class": "chaxunrending",
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-09 09:28:46 * @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-12-01 14:12:43 * @LastEditTime: 2021-12-01 15:21:02
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
...@@ -810,7 +810,7 @@ export default { ...@@ -810,7 +810,7 @@ export default {
}); });
this.imageEditor = imageEditor; this.imageEditor = imageEditor;
imageEditor.loadImageFromURL("img/xxx.bmp", "SampleImage").then(function(sizeValue) { imageEditor.loadImageFromURL("img/xxx.jpg", "SampleImage").then(function(sizeValue) {
//console.log(sizeValue); //console.log(sizeValue);
imageEditor.clearUndoStack(); imageEditor.clearUndoStack();
}); });
...@@ -824,7 +824,7 @@ export default { ...@@ -824,7 +824,7 @@ export default {
} }
}); });
this.imageEditor2 = imageEditor2; this.imageEditor2 = imageEditor2;
imageEditor2.loadImageFromURL("img/xxx.bmp", "SampleImage").then(function(sizeValue) { imageEditor2.loadImageFromURL("img/xxx.jpg", "SampleImage").then(function(sizeValue) {
//console.log(sizeValue); //console.log(sizeValue);
imageEditor2.clearUndoStack(); imageEditor2.clearUndoStack();
}); });
...@@ -1929,11 +1929,11 @@ export default { ...@@ -1929,11 +1929,11 @@ export default {
self.delMsg = obj.msg self.delMsg = obj.msg
self.delTime = obj.delTime self.delTime = obj.delTime
self.sourceImage = null; self.sourceImage = null;
imageEditor.loadImageFromURL("xxx", "SampleImage").then(function(sizeValue) { imageEditor.loadImageFromURL("xxx.jpg", "SampleImage").then(function(sizeValue) {
// //console.log(sizeValue); // //console.log(sizeValue);
imageEditor.clearUndoStack(); imageEditor.clearUndoStack();
}); });
imageEditor2.loadImageFromURL("xxx", "SampleImage").then(function(sizeValue) { imageEditor2.loadImageFromURL("xxx.jpg", "SampleImage").then(function(sizeValue) {
// //console.log(sizeValue); // //console.log(sizeValue);
imageEditor2.clearUndoStack(); imageEditor2.clearUndoStack();
}); });
......
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:58:13 * @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-11 17:58:34 * @LastEditTime: 2021-12-01 20:50:56
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js * @FilePath: \founder_vue\src\router\modules\index.js
...@@ -291,5 +291,25 @@ export default [ ...@@ -291,5 +291,25 @@ export default [
auth: "5" auth: "5"
}, },
component: () => import("@/views/SystemManage/GroupPermission.vue") component: () => import("@/views/SystemManage/GroupPermission.vue")
},
{
path: "/bzxxgl",
name: "bzxxgl",
icon_d: "/img/bzxxgl_d.png",
icon_a: "/img/bzxxgl_a.png",
meta: {
title: "比中信息管理",
auth: "5",
},
},
{
path: "/bzxxfh",
name: "bzxxfh",
meta: {
title: "比中信息复合",
auth: "5",
parentId: 'bzxxgl'
},
component: () => import("@/views/bzxxgl/bzxxfh.vue")
} }
] ]
...@@ -1169,6 +1169,9 @@ export default { ...@@ -1169,6 +1169,9 @@ export default {
} }
} }
} }
/deep/.el-checkbox__inner {
cursor: pointer;
}
/deep/.el-checkbox.is-checked { /deep/.el-checkbox.is-checked {
.el-checkbox__label { .el-checkbox__label {
color: #333333; color: #333333;
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 11:36:10 * @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-01 11:57:50 * @LastEditTime: 2021-12-02 13:31:28
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...@@ -1293,7 +1293,7 @@ export default { ...@@ -1293,7 +1293,7 @@ export default {
$(`#tzd${self.tzdId}`).css("left", (item.zwtzd_tzxzb - 4) / self.zoomLevel + "px"); $(`#tzd${self.tzdId}`).css("left", (item.zwtzd_tzxzb - 4) / self.zoomLevel + "px");
$(`#tzd${self.tzdId}`).css("top", (item.zwtzd_tzyzb - 4) / self.zoomLevel + "px"); $(`#tzd${self.tzdId}`).css("top", (item.zwtzd_tzyzb - 4) / self.zoomLevel + "px");
$(`#tzd${self.tzdId}`).css("box-sizing", "border-box"); $(`#tzd${self.tzdId}`).css("box-sizing", "border-box");
$("#tzd" + self.tzdId).css("transform", `rotate(${item.zwtzd_tzfx}deg)`); $("#tzd" + self.tzdId).css("transform", `rotate(${-item.zwtzd_tzfx}deg)`);
self.tzdId++; self.tzdId++;
}); });
...@@ -1654,22 +1654,33 @@ export default { ...@@ -1654,22 +1654,33 @@ export default {
let cos = heng / distance; let cos = heng / distance;
//角度 //角度
self.deg = (Math.acos(cos) * 180) / Math.PI; self.deg = (Math.acos(cos) * 180) / Math.PI;
// 根据象限判断
//根据象限判断
if (e.clientX >= this.originX && e.clientY <= this.originY) { if (e.clientX >= this.originX && e.clientY <= this.originY) {
self.deg = -self.deg; // console.log(self.deg);
// self.deg = -self.deg;
self.deg = self.deg;
} else if (e.clientX <= this.originX && e.clientY >= this.originY) { } else if (e.clientX <= this.originX && e.clientY >= this.originY) {
self.deg = 90 + (90 - self.deg); // self.deg = 90 + (90 - self.deg);
// self.deg = -(90 + (90 - self.deg));
self.deg = self.deg + 180
// console.log(self.deg);
} else if (e.clientX <= this.originX && e.clientY <= this.originY) { } else if (e.clientX <= this.originX && e.clientY <= this.originY) {
self.deg = -(90 + (90 - self.deg)); // console.log(self.deg);
// self.deg = -(90 + (90 - self.deg));
self.deg = (90 + (90 - self.deg));
// self.deg = 360 - self.deg;
} else if (e.clientX >= this.originX && e.clientY >= this.originY) {
// console.log(self.deg);
self.deg = 270 + (90-self.deg)
} }
if (self.deg === NaN) { if(self.deg == 360) {
self.deg = 0; self.deg = 0
} }
//console.log(self.startPlace, "原点 "); //console.log(self.startPlace, "原点 ");
if (self.deg) { if (self.deg) {
$("#tzd" + self.tzdId).css("transform", `rotate(${self.deg - self.startPlace}deg)`); // $("#tzd" + self.tzdId).css("transform", `rotate(${self.deg - self.startPlace}deg)`);
$("#tzd" + self.tzdId).css("transform", `rotate(${-self.deg - self.startPlace}deg)`);
} else { } else {
// //console.log("无效的移动"); // //console.log("无效的移动");
} }
...@@ -1695,7 +1706,7 @@ export default { ...@@ -1695,7 +1706,7 @@ export default {
return item.id == self.tzdId; return item.id == self.tzdId;
}); });
// self.$set(self.tzdArr[self.tzdId], 'angle', obj.deg) // self.$set(self.tzdArr[self.tzdId], 'angle', obj.deg)
self.tzdArr[objindex].angle = self.deg - self.startPlace; self.tzdArr[objindex].angle = self.deg;
} else { } else {
//console.log(self.tzdArr); //console.log(self.tzdArr);
//console.log(self.tzdId); //console.log(self.tzdId);
...@@ -1901,7 +1912,7 @@ export default { ...@@ -1901,7 +1912,7 @@ export default {
$(`#tzd${self.tzdId}`).css("left", (item.zwtzd_tzxzb - 4) / self.zoomLevel + "px"); $(`#tzd${self.tzdId}`).css("left", (item.zwtzd_tzxzb - 4) / self.zoomLevel + "px");
$(`#tzd${self.tzdId}`).css("top", (item.zwtzd_tzyzb - 4) / self.zoomLevel + "px"); $(`#tzd${self.tzdId}`).css("top", (item.zwtzd_tzyzb - 4) / self.zoomLevel + "px");
$(`#tzd${self.tzdId}`).css("box-sizing", "border-box"); $(`#tzd${self.tzdId}`).css("box-sizing", "border-box");
$("#tzd" + self.tzdId).css("transform", `rotate(${item.zwtzd_tzfx}deg)`); $("#tzd" + self.tzdId).css("transform", `rotate(${-item.zwtzd_tzfx}deg)`);
self.tzdId++; self.tzdId++;
}); });
self.$store.commit("zwbj/setAutoTzdall", self.autoTzdArr); self.$store.commit("zwbj/setAutoTzdall", self.autoTzdArr);
...@@ -2128,8 +2139,10 @@ export default { ...@@ -2128,8 +2139,10 @@ export default {
this.isRotateOptions = !this.isRotateOptions; this.isRotateOptions = !this.isRotateOptions;
if (this.isActive_rotate) { if (this.isActive_rotate) {
$(".icon_rotate").css("background", "#055FE7"); $(".icon_rotate").css("background", "#055FE7");
$(".rotateOptions").css('z-index', '99999')
} else { } else {
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)");
$(".rotateOptions").css('z-index', '1')
} }
}, },
/** /**
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 11:36:10 * @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-01 11:57:37 * @LastEditTime: 2021-12-02 13:33:11
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...@@ -2008,7 +2008,7 @@ export default { ...@@ -2008,7 +2008,7 @@ export default {
$(`#tzd${self.tzdId}`).css("box-sizing", "border-box"); $(`#tzd${self.tzdId}`).css("box-sizing", "border-box");
$("#tzd" + self.tzdId).css( $("#tzd" + self.tzdId).css(
"transform", "transform",
`rotate(${item.xczw_zwtzd_tzfx}deg)` `rotate(${-item.xczw_zwtzd_tzfx}deg)`
); );
self.tzdId++; self.tzdId++;
...@@ -2788,19 +2788,21 @@ export default { ...@@ -2788,19 +2788,21 @@ export default {
//根据象限判断 //根据象限判断
if (e.clientX >= this.originX && e.clientY <= this.originY) { if (e.clientX >= this.originX && e.clientY <= this.originY) {
self.deg = -self.deg; self.deg = self.deg;
} else if (e.clientX <= this.originX && e.clientY >= this.originY) { } else if (e.clientX <= this.originX && e.clientY >= this.originY) {
self.deg = 90 + (90 - self.deg); self.deg = self.deg + 180
} else if (e.clientX <= this.originX && e.clientY <= this.originY) { } else if (e.clientX <= this.originX && e.clientY <= this.originY) {
self.deg = -(90 + (90 - self.deg)); self.deg = (90 + (90 - self.deg));
} else if (e.clientX >= this.originX && e.clientY >= this.originY) {
self.deg = 270 + (90 - self.deg)
} }
if (self.deg === NaN) { if (self.deg == 360) {
self.deg = 0; self.deg = 0
} }
// console.log(self.startPlace, "原点 "); // console.log(self.startPlace, "原点 ");
if (self.deg) { if (self.deg) {
$("#tzd" + self.tzdId).css("transform", `rotate(${self.deg - self.startPlace}deg)`); $("#tzd" + self.tzdId).css("transform", `rotate(${-self.deg - self.startPlace}deg)`);
// obj.deg = deg - self.startPlace; // obj.deg = deg - self.startPlace;
} else { } else {
// console.log("无效的移动"); // console.log("无效的移动");
...@@ -2912,7 +2914,7 @@ export default { ...@@ -2912,7 +2914,7 @@ export default {
return item.id == self.tzdId; return item.id == self.tzdId;
}); });
// self.$set(self.tzdArr[self.tzdId], 'angle', obj.deg) // self.$set(self.tzdArr[self.tzdId], 'angle', obj.deg)
self.tzdArr[objindex].angle = self.deg - self.startPlace; self.tzdArr[objindex].angle = self.deg;
} else { } else {
console.log(self.tzdArr); console.log(self.tzdArr);
console.log(self.tzdId); console.log(self.tzdId);
...@@ -3376,7 +3378,7 @@ export default { ...@@ -3376,7 +3378,7 @@ export default {
$(`#auto_tzdDom${self.tzdId}`).css("left", (item.xczw_zwtzd_tzxzb - 4) / self.zoomLevel + "px"); $(`#auto_tzdDom${self.tzdId}`).css("left", (item.xczw_zwtzd_tzxzb - 4) / self.zoomLevel + "px");
$(`#auto_tzdDom${self.tzdId}`).css("top", (item.xczw_zwtzd_tzyzb - 4) / self.zoomLevel + "px"); $(`#auto_tzdDom${self.tzdId}`).css("top", (item.xczw_zwtzd_tzyzb - 4) / self.zoomLevel + "px");
$(`#auto_tzdDom${self.tzdId}`).css("box-sizing", "border-box"); $(`#auto_tzdDom${self.tzdId}`).css("box-sizing", "border-box");
$("#auto_tzdDom" + self.tzdId).css("transform", `rotate(${item.xczw_zwtzd_tzfx}deg)`); $("#auto_tzdDom" + self.tzdId).css("transform", `rotate(${-item.xczw_zwtzd_tzfx}deg)`);
self.tzdId++; self.tzdId++;
}); });
} else { } else {
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 09:42:07 * @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-30 13:43:02 * @LastEditTime: 2021-12-02 12:03:12
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
...@@ -89,6 +89,34 @@ ...@@ -89,6 +89,34 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<div class="left-right-hand" v-else-if="zwSelect==='掌纹'">
<el-tabs v-model="activePainHand" @tab-click="handlePainClick">
<el-tab-pane label="右手" name="right" class="left-hand">
<div class="fingerDom" v-for="(item) in painFingersRight" :key="item.code" @click="rollFingersLeftChange(item)">
<div v-if="item.image" class="fingerPic" :class="{fingerPicActive: activerollFinger===item.code}">
<div class="finger-number">{{item.code}}</div>
<img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" />
</div>
<div v-else class="absence">
<img src="@/assets/img/absence.png" alt="">
</div>
<div class="finger-name">{{item.name}}</div>
</div>
</el-tab-pane>
<el-tab-pane label="左手" name="left" class="left-hand">
<div class="fingerDom" v-for="(item) in painFingersLeft" :key="item.code" @click="rollFingersLeftChange(item)">
<div v-if="item.image" class="fingerPic" :class="{fingerPicActive: activerollFinger===item.code}">
<div class="finger-number">{{item.code}}</div>
<img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" />
</div>
<div v-else class="absence">
<img src="@/assets/img/absence.png" alt="">
</div>
<div class="finger-name">{{item.name}}</div>
</div>
</el-tab-pane>
</el-tabs>
</div>
<div class="finger-total"> <div class="finger-total">
共计<span>{{rollFingersLeft.length+rollFingersRight.length+painFingersLeft.length+painFingersRight.length}}</span>指纹 共计<span>{{rollFingersLeft.length+rollFingersRight.length+painFingersLeft.length+painFingersRight.length}}</span>指纹
</div> </div>
...@@ -120,6 +148,33 @@ export default { ...@@ -120,6 +148,33 @@ export default {
activeRollHand: 'right', activeRollHand: 'right',
activePainHand: 'right', activePainHand: 'right',
activerollFinger: '6', activerollFinger: '6',
handLeft: [
{
code: '11',
name: '拇',
image: null
},
{
code: '12',
name: '食',
image: null
},
{
code: '13',
name: '中',
image: null
},
{
code: '14',
name: '环',
image: null
},
{
code: '15',
name: '小',
image: null
}
],
rollFingersLeft: [ rollFingersLeft: [
{ {
code: '6', code: '6',
...@@ -265,10 +320,28 @@ export default { ...@@ -265,10 +320,28 @@ export default {
// setTimeout(() => { // setTimeout(() => {
// //console.log(this.finger); // //console.log(this.finger);
// }, 1000); // }, 1000);+
this.getHandsData()
}, },
methods: { methods: {
/** /**
* 获取掌纹数据
*/
getHandsData() {
let self = this
this.$axios({
method: 'post',
url: '/api/png/palm/barcode',
data: {
barcode: 'R4308214500002021100049'
// barcode: self.barcode
}
}).then(res => {
console.log(res);
})
},
/**
* 打开档案信息 * 打开档案信息
*/ */
daxxChange() { daxxChange() {
......
// table表的高度
$tableHeight: var(--tableHeight, 450px);
#bzxxfh {
width: 100%;
overflow: hidden;
.bzxxfh-top {
margin: 24px 24px 16px 24px;
border-bottom: 1px solid #eeeeee;
/deep/.el-form-item__label {
width: 70px !important;
padding: 0;
}
/deep/.el-form-item__content {
margin-left: 75px !important;
}
/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: 156px;
height: 32px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #e6e6e8;
}
/deep/ .el-input {
width: 156px;
height: 32px;
.el-input__inner {
height: 32px;
}
}
/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;
}
/deep/.el-input__icon {
height: auto;
}
.line1 {
display: flex;
align-items: center;
margin-bottom: 20px;
.el-form-item {
margin-right: 24px;
}
.ytmh {
/deep/ .el-input {
width: 256px;
height: 32px;
.el-input__inner {
height: 32px;
width: 256px;
}
}
}
.mbtmh {
/deep/.el-form-item__label {
width: 84px !important;
padding: 0;
}
/deep/.el-form-item__content {
margin-left: 90px !important;
}
/deep/ .el-input {
width: 256px;
height: 32px;
.el-input__inner {
height: 32px;
width: 256px;
}
}
}
}
.line2 {
.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: 256px;
height: 32px;
}
/deep/.el-range-separator {
width: 16px;
line-height: 24px;
color: #999;
}
/deep/.el-form-item__label {
text-align: left;
}
}
.line3 {
.fhyh {
/deep/.el-form-item__label {
width: 84px !important;
padding: 0;
}
/deep/.el-form-item__content {
margin-left: 90px !important;
}
}
.sjzjw {
margin-right: 5px;
/deep/.el-form-item__label {
width: 84px !important;
}
/deep/.el-form-item__content {
margin-left: 90px !important;
}
.el-radio {
color: #666;
margin-right: 12px;
}
/deep/.el-radio__input.is-checked + .el-radio__label {
color: #333333;
}
/deep/.el-radio__input.is-checked .el-radio__inner {
border: 1px solid #055fe7;
background: #055fe7;
}
/deep/.el-radio__inner {
width: 16px;
height: 16px;
&::after {
width: 8px;
height: 8px;
}
}
}
.clear-btn {
cursor: pointer;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055fe7;
margin-right: 8px;
}
.select-btn {
cursor: pointer;
width: 96px;
height: 32px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
display: flex;
align-items: center;
justify-content: center;
&:hover {
background: #377fec;
}
&:active {
background: #044cb9;
}
}
}
}
.bzxxfh-content {
width: 100%;
padding: 0 24px;
.bzxxfh-content-top {
display: flex;
align-items: center;
justify-content: space-between;
.btn {
cursor: pointer;
border-radius: 4px;
height: 32px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
display: flex;
align-items: center;
justify-content: center;
margin-left: 14px;
&:nth-child(1) {
margin-left: 0;
}
&:hover {
border: 1px solid #055fe7;
color: #055fe7;
}
&:active {
border: 1px solid #044cb9;
color: #044cb9;
}
}
.bzxxfh-content-top-left {
.plcz {
width: 96px;
}
}
.bzxxfh-content-top-right {
display: flex;
align-items: center;
.jcbzgx {
width: 124px;
}
.cxfh,
.fztm {
width: 96px;
}
.dy,
.sc {
width: 72px;
}
}
}
.bzxxfh-content-content {
margin-top: 16px;
/deep/.el-table th {
background-color: #f6f8fa;
}
/deep/.el-checkbox__inner {
cursor: pointer;
}
/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 {
color: #666;
margin-right: 32px;
}
.dfh {
cursor: pointer;
width: 72px;
height: 28px;
border-radius: 4px;
border: 1px solid #fe0000;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #fe0000;
display: flex;
align-items: center;
justify-content: center;
}
.cxfh {
cursor: pointer;
width: 72px;
height: 28px;
border-radius: 4px;
border: 1px solid #055fe7;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055fe7;
display: flex;
align-items: center;
justify-content: center;
}
.fhzt {
display: flex;
align-items: center;
}
.wfh {
width: 8px;
height: 8px;
background: #fe0000;
border-radius: 50%;
margin-right: 6px;
}
.fhyx {
width: 8px;
height: 8px;
background: #055fe7;
border-radius: 50%;
margin-right: 6px;
}
.fhwx {
width: 8px;
height: 8px;
background: #ffa219;
border-radius: 50%;
margin-right: 6px;
}
.el-tag {
margin-bottom: 16px;
width: 100%;
height: 40px;
background: #ddebff;
line-height: 40px;
color: #666666;
}
.clearCheck {
cursor: pointer;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055fe7;
margin-left: 16px;
}
}
.bzxxfh-table {
height: $tableHeight;
}
}
.bzxxfh-content-content-footer {
margin-top: 16px;
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
.record {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
}
}
.paging {
float: right;
}
/deep/.el-pager {
.number {
background-color: transparent;
cursor: pointer;
}
.number.active {
background-color: #055fe7 !important;
box-shadow: 0px 12px 16px 1px rgba(0, 21, 51, 0.03);
border-radius: 6px;
}
.el-icon.more.btn-quicknext.el-icon-more,
.el-icon.more.btn-quickprev.el-icon-more {
background-color: transparent !important;
}
}
/deep/ .btn-prev,
/deep/.btn-next {
background-color: transparent !important;
cursor: pointer;
i {
cursor: pointer;
}
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
// 滚动条的宽度
/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;
}
// 隐藏掉table多选框
.delSelection /deep/ .el-table-column--selection .cell {
display: none;
}
}
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-01 09:55:26 * @LastEditTime: 2021-12-02 11:55:08
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js * @FilePath: \指纹系统\founder_vue\vue.config.js
...@@ -92,13 +92,13 @@ module.exports = { ...@@ -92,13 +92,13 @@ module.exports = {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ // target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.2:8099/", // 张 认定 // target: "http://172.18.108.2:8099/", // 张 认定
// target: "http://192.168.128.108:8099", // 湖南-张 // target: "http://192.168.128.108:8099", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马 target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王 // target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张呈光 // target: "http://192.168.128.118:8764", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099", // target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602", // target: "http://47.92.225.109:5602",
target: "http://www.meetfood.cn:2390", // 湖南-线上 // target: "http://www.meetfood.cn:2390", // 湖南-线上
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
...@@ -108,6 +108,7 @@ module.exports = { ...@@ -108,6 +108,7 @@ module.exports = {
}, },
"/login": { "/login": {
target: "http://www.meetfood.cn:2390/", // 登录 target: "http://www.meetfood.cn:2390/", // 登录
// target: "http://192.168.128.114:8099", // 登录-马
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
...@@ -128,6 +129,7 @@ module.exports = { ...@@ -128,6 +129,7 @@ module.exports = {
//target: "http://192.168.128.106:8765", // 湖南-王 //target: "http://192.168.128.106:8765", // 湖南-王
// target: "http://192.168.128.108:8764", // 湖南-张 // target: "http://192.168.128.108:8764", // 湖南-张
target: "http://www.meetfood.cn:2390", // 湖南-王 target: "http://www.meetfood.cn:2390", // 湖南-王
// target: "http://192.168.128.114:8099", // 湖南-马
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { 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