Skip to content

F
founder_vue
Commit 06e4052e by 李姝悦
Options

Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev

parents ce1f879e ed7da8df
Showing with 468 additions and 178 deletions
public/iconfont/demo_index.html
......@@ -55,6 +55,18 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe649;</span>
<div class="name">提示</div>
<div class="code-name">&amp;#xe649;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe648;</span>
<div class="name">标签-关闭</div>
<div class="code-name">&amp;#xe648;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe647;</span>
<div class="name">下拉</div>
<div class="code-name">&amp;#xe647;</div>
......@@ -408,9 +420,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1641819815848') format('woff2'),
url('iconfont.woff?t=1641819815848') format('woff'),
url('iconfont.ttf?t=1641819815848') format('truetype');
src: url('iconfont.woff2?t=1641955164800') format('woff2'),
url('iconfont.woff?t=1641955164800') format('woff'),
url('iconfont.ttf?t=1641955164800') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -437,6 +449,24 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-tishi"></span>
<div class="name">
提示
</div>
<div class="code-name">.icon-tishi
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-biaoqian-guanbi"></span>
<div class="name">
标签-关闭
</div>
<div class="code-name">.icon-biaoqian-guanbi
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-xiala"></span>
<div class="name">
下拉
......@@ -969,6 +999,22 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-tishi"></use>
</svg>
<div class="name">提示</div>
<div class="code-name">#icon-tishi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-biaoqian-guanbi"></use>
</svg>
<div class="name">标签-关闭</div>
<div class="code-name">#icon-biaoqian-guanbi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-xiala"></use>
</svg>
<div class="name">下拉</div>
......
public/iconfont/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 2961960 */
src: url('iconfont.woff2?t=1641819815848') format('woff2'),
url('iconfont.woff?t=1641819815848') format('woff'),
url('iconfont.ttf?t=1641819815848') format('truetype');
src: url('iconfont.woff2?t=1641955164800') format('woff2'),
url('iconfont.woff?t=1641955164800') format('woff'),
url('iconfont.ttf?t=1641955164800') format('truetype');
}
.iconfont {
......@@ -13,6 +13,14 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-tishi:before {
content: "\e649";
}
.icon-biaoqian-guanbi:before {
content: "\e648";
}
.icon-xiala:before {
content: "\e647";
}
......
public/iconfont/iconfont.json
......@@ -6,6 +6,20 @@
"description": "",
"glyphs": [
{
"icon_id": "27150195",
"name": "提示",
"font_class": "tishi",
"unicode": "e649",
"unicode_decimal": 58953
},
{
"icon_id": "27143085",
"name": "标签-关闭",
"font_class": "biaoqian-guanbi",
"unicode": "e648",
"unicode_decimal": 58952
},
{
"icon_id": "27111425",
"name": "下拉",
"font_class": "xiala",
......
src/App.vue
<!--
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-12-18 11:08:03
* @LastEditTime: 2022-01-11 22:40:17
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\App.vue
......
src/assets/css/globalBase.scss 0 → 100644
/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 {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
color: #055FE7;
}
// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效著作权归作者所有。
/deep/.el-input.is-active .el-input__inner, /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;
.el-range-input {
color: #055FE7;
}
}
// 去除table表格最底部边框
.el-table__row>td {
border: none;
}
// 去除table表格最底部边框
.el-table::before {
height: 0px;
}
/deep/.el-table .el-table__header-wrapper tr th{
background-color: #ECF1F7!important;
font-size: 14px !important;
font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282F3C !important;
height: 48px !important;
padding: 0 !important;
}
/deep/.el-table .el-table__body tr.current-row > td {
background-color: #F2F7FE !important;
}
/deep/.el-table .el-table__body tr:hover > td {
background-color: #F2F7FE !important;
}
/deep/.el-table__row {
height: 48px !important;
}
/deep/.el-table__row--level-1 {
.el-table__cell {
background-color: #F5F6F7 !important;
}
}
/deep/.el-table .el-table__cell {
padding: 0 !important;
}
/deep/.el-table__body {
width: 100% !important;
}
/deep/.btn-prev {
cursor: pointer;
i {
cursor: pointer;
}
}
/deep/.btn-next {
cursor: pointer;
i {
cursor: pointer;
}
}
// 分页
/deep/.el-pager {
.number {
background-color: transparent !important;
}
.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;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
// 修改下拉框样式
.el-select-dropdown__item {
padding-left: 10px !important;
}
// 日期选择器
/deep/.el-date-editor {
display: flex;
align-items: center;
}
/deep/.el-date-editor .el-range-separator {
line-height: 26px;
}
/deep/.el-input__icon {
height: 32px;
}
/deep/ .el-input__icon.el-range__icon.el-icon-date {
position: absolute;
right: 6px;
}
.f-primary-button {
cursor: pointer;
background: #055FE7 !important;
&:hover {
background: #377FEC !important;
}
&:active {
background: #044CB9 !important;
}
}
.f-default-button {
border-radius: 6px;
border: 1px solid #AEB5C2 !important;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #2E3846 !important;
&:hover {
border: 1px solid #055FE7 !important;
color: #055FE7 !important;
}
&:active {
border: 1px solid #044CB9 !important;
color: #044CB9 !important;
}
}
\ No newline at end of file
src/components/ImageEd.vue
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2022-01-11 13:27:45
* @LastEditTime: 2022-01-11 15:20:50
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
-->
......@@ -4730,41 +4730,40 @@ export default {
$(".lt_main_footer").css("opacity", "0");
$(".lt_cnadidate_search").css("opacity", "0");
$(".el-checkbox").css("opacity", "0");
setTimeout(() => {
html2canvas(
document.querySelector(".lt_main"),
{
backgroundColor: '#fff', //画出来的图片有白色的边框,不要可设置背景为透明色（null）
useCORS: true,//支持图片跨域
scale: 1, //设置放大的倍数
}
).then(canvas => {
// 截图用img元素承装，显示在页面的上
let img = new Image();
img.src = canvas.toDataURL("image/jpeg");// toDataURL :图片格式转成 base64
// document.getElementById('test').appendChild(img);
self.cropperImage = canvas.toDataURL("image/jpeg");
setTimeout(() => {
self.isCropper = false;
self.cropperImage = null;
}, 8000);
// 使用a标签进行下载
let a = document.createElement("a");
a.href = canvas.toDataURL("image/jpeg");
a.download = "screenshot.jpg";
a.click();
// 恢复界面
$(".lt_main_left").css('box-shadow', '0px 4px 10px 0px rgba(5, 95, 231, 0.3)')
$(".lt_main_right").css('box-shadow', '0px 4px 10px 0px rgba(5, 95, 231, 0.3)')
$(".header").css("opacity", "1");
$(".lt_header").css("opacity", "1");
$(".lt_main_header").css("opacity", "1");
$(".lt_main_footer").css("opacity", "1");
$(".lt_cnadidate_search").css("opacity", "1");
$(".el-checkbox").css("opacity", "1");
});
}, 5000);
let dom = document.querySelector(".lt_main")
html2canvas(
dom,
{
backgroundColor: '#fff', //画出来的图片有白色的边框,不要可设置背景为透明色（null）
useCORS: true,//支持图片跨域
scale: 1, //设置放大的倍数
}
).then(canvas => {
// 截图用img元素承装，显示在页面的上
let img = new Image();
img.src = canvas.toDataURL("image/jpeg");// toDataURL :图片格式转成 base64
// document.getElementById('test').appendChild(img);
self.cropperImage = canvas.toDataURL("image/jpeg");
setTimeout(() => {
self.isCropper = false;
self.cropperImage = null;
}, 8000);
// 使用a标签进行下载
let a = document.createElement("a");
a.href = canvas.toDataURL("image/jpeg");
a.download = "screenshot.jpg";
a.click();
// 恢复界面
$(".lt_main_left").css('box-shadow', '0px 4px 10px 0px rgba(5, 95, 231, 0.3)')
$(".lt_main_right").css('box-shadow', '0px 4px 10px 0px rgba(5, 95, 231, 0.3)')
$(".header").css("opacity", "1");
$(".lt_header").css("opacity", "1");
$(".lt_main_header").css("opacity", "1");
$(".lt_main_footer").css("opacity", "1");
$(".lt_cnadidate_search").css("opacity", "1");
$(".el-checkbox").css("opacity", "1");
});
} else if (this.$route.name == "TL" || this.$route.name == 'rgTL') {
// 倒查页面
$(".top").css('opacity', '0')
......
src/router/modules/leftMenu.js
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2022-01-10 12:00:05
* @LastEditTime: 2022-01-12 11:27:48
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......@@ -41,7 +41,6 @@ export default [
meta: {
parentId: 'zzwlr',
title: '新增人员',
// auth: 'A'
},
component: () => import('@/views/zzwlr/xzry.vue')
},
......@@ -55,7 +54,6 @@ export default [
meta: {
parentId: 'zzwlr',
title: '新增人员',
// auth: 'A'
},
component: () => import('@/views/zzwlr/xzry.vue')
},
......@@ -128,18 +126,6 @@ export default [
component: () => import('@/views/Editor/ajzwbj.vue')
},
{
path: '/cxyrd',
name: 'cxyrd',
hidden: false,
icon_d: '/img/cxyrd_d.png',
icon_a: '/img/cxyrd_a.png',
meta: {
title: '查询与认定',
auth: 'C'
},
component: () => import('@/views/cxyrd/QueryConfirm.vue')
},
{
path: '/zljc',
name: 'zljc',
hidden: false,
......@@ -176,6 +162,18 @@ export default [
component: () => import('@/views/daxx/Index.vue')
},
{
path: '/cxyrd',
name: 'cxyrd',
hidden: false,
icon_d: '/img/cxyrd_d.png',
icon_a: '/img/cxyrd_a.png',
meta: {
title: '查询与认定',
auth: 'C'
},
component: () => import('@/views/cxyrd/QueryConfirm.vue')
},
{
path: '/AllPersonnelBaseIndex',
name: 'AllPersonnelBaseIndex',
redirect: '/AllPersonnelBase',
......@@ -306,7 +304,7 @@ export default [
hidden: false,
meta: {
title: '发查询权限',
auth: 'H-4',
auth: 'H-5',
parentId: 'SystemManage'
},
component: () =>
......@@ -368,7 +366,7 @@ export default [
hidden: false,
meta: {
title: '系统分库管理',
auth: 'H-4',
auth: 'H-6',
parentId: 'SystemManage'
},
component: () =>
......
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -222,7 +222,6 @@
>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="auto"
>
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -139,11 +139,11 @@
>
<el-radio-group v-model="ruleForm.matchCount">
<el-radio label="10"></el-radio>
<el-radio label="20"></el-radio>
<el-radio label="50"></el-radio>
<el-radio label="100"></el-radio>
<el-radio label="200"></el-radio>
<el-radio label="500"></el-radio>
<el-radio label="1000"></el-radio>
</el-radio-group>
</el-form-item>
......@@ -358,11 +358,11 @@
>
<el-radio-group v-model="ruleForm.matchCount">
<el-radio label="10"></el-radio>
<el-radio label="20"></el-radio>
<el-radio label="50"></el-radio>
<el-radio label="100"></el-radio>
<el-radio label="200"></el-radio>
<el-radio label="500"></el-radio>
<el-radio label="1000"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
......@@ -577,9 +577,9 @@ export default {
cxtype: [],
querytype: '', // 查询类型
},
srcDataType: [],// 源数据类型人员
srcDataType: ["1", "2"],// 源数据类型人员
queryClass: '3', // 优先级
matchCount: '10',// 候选个数
matchCount: '20',// 候选个数
srcDataTypeAj: ['7'],//源数据类型案件
},
rules: {
......@@ -759,7 +759,7 @@ export default {
this.dataRy = [1]
this.dataAj = [1]
this.ruleForm.queryClass = '3'
this.ruleForm.matchCount = '10'
this.ruleForm.matchCount = '20'
this.dxcx = {
domains: [],
barcodeFilter: ''
......@@ -796,7 +796,7 @@ export default {
this.dataRy = [1]
this.dataAj = [1]
this.ruleForm.queryClass = '3'
this.ruleForm.matchCount = '10'
this.ruleForm.matchCount = '20'
this.dxcx = { // 定向查询
domains: [],
barcodeFilter: ''
......
src/views/Home/Home.vue
......@@ -278,12 +278,15 @@ export default {
// this.$router.pushToTab("/zzwcj")
// this.$router.pushToTab('/fingerprintIndex/R4300000000002021125008/admin')
// 跳到全部人员库，打开新增人员弹窗
// this.$router.pushToTab({
// path: "/AllPersonnelBaseIndex",
// query: {
// xzry: true,
// },
// });
this.$router.pushToTab({
path: "/AllPersonnelBaseIndex",
query: {
xzry: true,
},
});
path: "/xzry"
})
},
gozljc (type) {
if (!this.roleArr.includes("D")) return;
......@@ -467,7 +470,7 @@ export default {
font-size: 18px;
color: #999999;
line-height: 24px;
font-family:HarmonyOS_Sans_SC ;
font-family: HarmonyOS_Sans_SC;
}
.main .title1 {
font-size: 36px;
......
src/views/cxyrd/LT.vue
<template>
<div class="ltDiv">
<div class="lt-dom" :class="{ bzActive: isShowbzDialogBg || loading_sd }">
<div class="top-head">
<div class="top-head">
<img src="@/assets/img/rgrd/gongjvlan.png" alt="">
</div>
<div class="header">
......@@ -15,7 +15,7 @@
</div>
</div>
<!-- <div class="header_line"></div> -->
<div class="lt_main">
<div class="lt_main" id="screenShot">
<div class="lt_main_left">
<l-t-src :src-data="qid"></l-t-src>
</div>
......
src/views/cxyrd/QueryConfirm.vue
......@@ -72,7 +72,7 @@
>
清空
</div>
<el-button type="primary" @click="search">筛选结果</el-button>
<el-button type="primary" class="f-primary-button" @click="search">筛选</el-button>
</div>
</div>
<div class="width100 margin_top24_bottom24 display_style">
......@@ -220,6 +220,7 @@
<!-- 自定义列 止 -->
<!-- 复制条码号 起 -->
<el-button
type="info"
v-if="roleArr.includes('C-1-3')"
v-clipboard:copy="barcode"
......@@ -231,6 +232,7 @@
</el-button>
<!-- 复制条码号 止 -->
<el-button
type="info"
@click="delMore"
v-if="roleArr.includes('C-1-4')"
......@@ -267,7 +269,7 @@
<el-table
style="width: 100%"
:height="height"
border
:border="false"
@selection-change="handleSelectionChange"
ref="confirmTable"
tooltip-effect="dark"
......@@ -602,7 +604,7 @@ export default {
expanded: false, // 展开标志
historyDialogVisible: false,
cxyrdWidth1: 200,
height: 400,
height: '33rem',
dialogType: "ry",
dialogQid: "",
// cxyrdWidth1: sessionStorage.getItem('cxyrdWidth1'),
......@@ -614,7 +616,7 @@ export default {
let w1 = 1920;
let h1 = 400;
let w2 = window.innerWidth;
this.height = (h1 * w2) / w1;
// this.height = (h1 * w2) / w1;
this.cxyrdWidth1 = (this.cxyrdWidth1 * w2) / w1;
content.forEach((item) => {
......@@ -1358,7 +1360,7 @@ const setQueryClass = [
}
/deep/.el-table th > .cell {
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
font-family: HarmonyOS_Sans_SC_Medium;
font-weight: normal;
color: #282f3c;
}
......@@ -1504,7 +1506,7 @@ b {
.el-tag {
color: #055fe7 !important;
height: 32px;
box-sizing: content-box !important;
box-sizing: border-box !important;
padding: 0 8px !important;
background: #ddebff;
border-radius: 4px;
......@@ -1724,6 +1726,10 @@ b {
border: 1px solid #055fe7;
color: #055fe7;
}
.el-button--info:active {
border: 1px solid #044CB9;
color: #044CB9;
}
/deep/.el-checkbox__input.is-checked .el-checkbox__inner,
.el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #055fe7 !important;
......@@ -1789,13 +1795,15 @@ b {
}
.confirm_main {
width: 100%;
height: 60px;
// height: 60px;
height: 620px;
border-bottom: 1px solid #eeeeee;
}
.confirm_main_table {
margin: 6px 0 15px 0;
padding: 0;
width: 100%;
height: 500px;
height: 528px;
.mineral-table {
// height: 450px;
}
......@@ -1826,7 +1834,7 @@ b {
transform: translateY(-50%);
}
.removeDia {
width: 1527px !important;
width: 1600px !important;
}
.el-table {
/deep/ .el-checkbox {
......@@ -1915,4 +1923,5 @@ b {
background-repeat: no-repeat;
transform: rotate(180deg) !important;
}
@import "@/assets/css/globalBase.scss";
</style>
src/views/cxyrd/modules/LTSrc.vue
......@@ -46,13 +46,13 @@
<!-- 指纹/掌纹切换 -->
<div class="btns-switch">
<div class="btn" @click="switchZhiWen" :class="{ active: fingerShowType == '指纹' }">
<span><span>指纹</span></span>
<span>指纹</span>
</div>
<div class="btn" v-show="!isDelete && handList.length != 0" @click="switchZhangWen" :class="{ active: fingerShowType == '掌纹' }">
<span><span>掌纹</span></span>
<span>掌纹</span>
</div>
<div class="btn isDelete" v-show="isDelete || handList.length == 0">
<span><span>掌纹</span></span>
<span>掌纹</span>
</div>
</div>
<!--指纹图-->
......@@ -729,7 +729,6 @@ const datas = [
display: flex;
justify-content: center;
// background-color: #fff;
background-color: green;
.btn {
cursor: pointer;
width: 129px;
......@@ -1331,7 +1330,7 @@ $tableHeight: var(--tableHeight, 320px);
}
}
}
}
}
/deep/ .el-checkbox {
color: #666;
......
src/views/drFPTX/Index.vue
......@@ -24,46 +24,52 @@
</el-radio>
</el-radio-group>
<div class='choose'>
<div class="wjlx">
<div class="left">
<el-radio-group v-model="wjlx">
<el-radio :label="3">文件</el-radio>
<el-radio :label="6">文件夹</el-radio>
</el-radio-group>
</div>
<div class="right">
<div class='center'>
<el-input
placeholder="请选择文件路径"
v-model="fileName"
></el-input>
<div class="line"></div>
<div
class="text"
@click="wjlx==3 ? uploadFile() : uploadFiles()"
>选择
<div class="chooseTip">
<div class="wjlx">
<div class="left">
<el-radio-group v-model="wjlx">
<el-radio :label="3">文件</el-radio>
<el-radio :label="6">文件夹</el-radio>
</el-radio-group>
</div>
<div class="right">
<div class='center'>
<el-input
placeholder="请选择文件路径"
v-model="fileName"
></el-input>
<div class="line"></div>
<div
class="text"
@click="wjlx==3 ? uploadFile() : uploadFiles()"
>选择
</div>
<!-- 上传 -->
<!-- style="display:none" -->
<el-upload
class="upload-demo"
ref="upload"
:multiple="true"
:action='action'
:on-preview="handlePreview"
:on-remove="handleRemove"
:on-success="uploadSuccess"
:on-change='onChange'
:on-progress="uploadProcess"
:file-list="fileList"
:auto-upload="false"
:before-upload="beforeUpload"
:show-file-list="false"
>
</el-upload>
</div>
<!-- 上传 -->
<!-- style="display:none" -->
<el-upload
class="upload-demo"
ref="upload"
:multiple="true"
:action='action'
:on-preview="handlePreview"
:on-remove="handleRemove"
:on-success="uploadSuccess"
:on-change='onChange'
:on-progress="uploadProcess"
:file-list="fileList"
:auto-upload="false"
:before-upload="beforeUpload"
:show-file-list="false"
>
</el-upload>
</div>
</div>
<div class="tip">
<span class="iconfont">&#xe649;</span>提示：当选择多个逻辑库时，工作流以最小ID逻辑库为准！
</div>
</div>
<el-button
:class="selectArr.length?'selected':'noselected'"
@click="submitUpload"
......@@ -83,7 +89,7 @@
FPTX的条码号
</div>
<el-table
height="550"
height="33rem"
:data="datas"
@selection-change="checkAll1"
style="width: 100%"
......@@ -184,7 +190,7 @@
需要导入的条码号
</div>
<el-table
height="550"
height="33rem"
ref='reftable1'
:data="selectArr"
style="width: 100%"
......@@ -285,7 +291,7 @@
FPTX的条码号
</div>
<el-table
height='550'
height='33rem'
:data="datas"
@selection-change="checkAll1"
style="width: 100%"
......@@ -370,7 +376,7 @@
需要导入的条码号
</div>
<el-table
height="550"
height="33rem"
ref='reftable2'
:data="selectArr"
@selection-change="checkRightAll"
......@@ -1442,6 +1448,10 @@ export default {
display: flex;
justify-content: space-between;
align-items: flex-end;
.chooseTip {
display: flex;
align-items: center;
}
.wjlx {
display: flex;
width: 609px;
......@@ -1450,6 +1460,17 @@ export default {
border-radius: 6px;
margin-top: 24px;
}
.tip {
margin-left: 24px;
margin-top: 24px;
color: #f8980a;
font-family: HarmonyOS_Sans_SC;
font-size: 14px;
span {
font-size: 14px;
margin-right: 5px;
}
}
.left {
width: 242px;
......@@ -1541,7 +1562,7 @@ export default {
.el-col {
.el-table {
height: 550px;
// height: 550px;
// background-color: #111;
border-radius: 8px;
}
......@@ -1697,7 +1718,7 @@ export default {
.el-col {
.el-table {
height: 550px;
// height: 550px;
}
.head {
......@@ -1868,4 +1889,5 @@ export default {
}
}
}
@import "@/assets/css/globalBase.scss";
</style>
src/views/drFPTX/RAList.vue
......@@ -138,10 +138,10 @@
type="text"
@click="clear"
>清空</el-button>
<el-button
class="sx"
<button
class="sx f-primary-button"
@click="search"
>筛选</el-button>
>筛选</button>
</div>
</div>
<div
......@@ -238,10 +238,10 @@
type="text"
@click="clear"
>清空</el-button>
<el-button
class="sx"
<button
class="sx f-primary-button"
@click="search"
>筛选</el-button>
>筛选</button>
</div>
</div>
......@@ -325,7 +325,7 @@
<div v-if="showType == 1 || showType == 3">
<el-table
:class="{delSelection: !selectBoo}"
:max-height="height"
:height="height"
ref="multipleTable"
:data="tableDate1"
tooltip-effect="dark"
......@@ -407,7 +407,7 @@
<el-table-column
prop="logicBatabaseName"
label="逻辑分库"
:width="width1"
:width="width_ljfk"
show-overflow-tooltip
>
</el-table-column>
......@@ -443,9 +443,8 @@
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
:width="width4"
width="auto"
>
<template slot-scope="scope">
<div
......@@ -515,7 +514,7 @@
class="bzTable"
:class="{delSelection: !selectBoo}"
v-if="showType == 2"
:max-height="height"
:height="height"
ref="multipleTable"
:data="tableDate2"
tooltip-effect="dark"
......@@ -631,7 +630,7 @@
<el-table-column
prop="logicBatabaseName"
label="逻辑分库"
:width="width1"
:width="width_ljfk2"
show-overflow-tooltip
>
......@@ -685,9 +684,8 @@
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
:width="width4"
width="auto"
>
<template slot-scope="scope">
<div
......@@ -845,7 +843,9 @@ export default {
let w1 = 1920;
let w2 = window.innerWidth;
this.height = (this.height * w2) / w1;
// this.height = (this.height * w2) / w1;
this.width_ljfk = (this.width_ljfk * w2) / w1;
this.width_ljfk2 = (this.width_ljfk2 * w2) / w1;
this.width1 = (this.width1 * w2) / w1;
this.width2 = (this.width2 * w2) / w1;
this.width3 = (this.width3 * w2) / w1;
......@@ -855,12 +855,14 @@ export default {
},
data () {
return {
width_ljfk: 500,
width_ljfk2: 400,
width5: 50,
width4: 200,
width3: 100,
width2: 250,
width1: 250,
height: 460,
height: "33rem",
width6: 160,
dataType: null, // 导入类型
barcode: "", // 条码号
......@@ -1656,11 +1658,12 @@ export default {
display: none;
}
/deep/.el-table--scrollable-x .el-table__body-wrapper {
height: 500px;
// height: 500px;
}
/deep/.el-radio__input.is-checked .el-radio__inner {
border-color: #055fe7;
background: #055fe7;
cursor: pointer;
}
.RAList {
height: 700px;
......@@ -1818,9 +1821,11 @@ export default {
font-family: HarmonyOS_Sans_SC;
margin-right: 25px;
color: #282f3c;
cursor: pointer;
/deep/ .el-radio__label {
padding: 0;
cursor: pointer;
}
/deep/ .el-radio__input.is-checked + .el-radio__label {
......@@ -2102,19 +2107,26 @@ export default {
background-repeat: no-repeat;
transform: rotate(180deg) !important;
}
/deep/.el-table--enable-row-transition .el-table__body td.el-table__cell {
height: 55px;
}
/deep/.el-table__row {
height: 55px;
}
// /deep/.el-table--enable-row-transition .el-table__body td.el-table__cell {
// height: 48px;
// }
// /deep/.el-table__row {
// height: 48px;
// }
/deep/.bzTable.el-table--enable-row-transition
.el-table__body
td.el-table__cell {
height: 71px;
}
/deep/.bzTable.el-table__row {
height: 55px;
// /deep/.bzTable.el-table__row {
// height: 48px;
// }
/deep/.el-table__fixed-right-patch {
width: auto !important;
}
/deep/.el-table__row {
width: 100%;
}
@import "@/assets/css/globalBase.scss";
</style>
src/views/zljc/Index.vue
......@@ -125,7 +125,7 @@
</el-tag>
<el-table
:max-height="height"
:height="height"
ref="multipleTable"
:data="tableDate"
:row-key="getRowKeys"
......@@ -305,7 +305,7 @@ export default {
width1: 220,
width2: 160,
width3: 110,
height: 550,
height: "33rem",
tableDate: [],
// 当前页数
currPage: 1,
......@@ -482,9 +482,9 @@ export default {
this.isShowTip = false;
this.toggleSelection();
if (this.isShowTip) {
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '30.375rem');
// document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '30.375rem');
} else {
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '34.375rem');
// document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '34.375rem');
}
},
/**
......@@ -498,9 +498,9 @@ export default {
this.toggleSelection();
// this.$set(this.multipleSelection, [])
if (this.isShowTip) {
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '30.375rem');
// document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '30.375rem');
} else {
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '34.375rem');
// document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '34.375rem');
}
},
/**
......@@ -604,7 +604,7 @@ export default {
<style lang="scss" scoped>
// table表的高度
$tableHeight: var(--tableHeight, 550px);
$tableHeight: var(--tableHeight, 33rem);
.czBtn {
width: 72px;
......@@ -674,33 +674,63 @@ $tableHeight: var(--tableHeight, 550px);
background: #fe0000;
}
// .footer {
// position: fixed;
// bottom: 0;
// padding: 0 24px;
// box-sizing: border-box;
// margin-top: 16px;
// width: 100%;
// display: flex;
// align-items: center;
// justify-content: space-between;
// .record {
// font-size: 14px;
// font-family: HarmonyOS_Sans_SC;
// color: #666666;
// }
// }
.footer {
padding: 0 24px;
box-sizing: border-box;
margin-top: 16px;
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
width: 1544px;
position: absolute;
bottom: 27px;
left: 24px;
.record {
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #666666;
}
.paging {
float: right;
}
}
// .footer {
// width: 96.5rem;
// position: absolute;
// bottom: 1.6875rem;
// left: 1.5rem;
// }
.content {
margin-top: 24px;
margin-top: 15px;
width: 100%;
padding: 0 24px;
box-sizing: border-box;
.el-tag {
width: 100%;
margin-bottom: 24px;
margin-bottom: 15px;
color: #666;
span {
color: #409eff;
}
}
.el-tag {
color: #055fe7 !important;
height: 32px;
box-sizing: border-box !important;
padding: 0 8px !important;
background: #ddebff;
border-radius: 4px;
}
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 6px; // 横向滚动条
......@@ -744,7 +774,7 @@ $tableHeight: var(--tableHeight, 550px);
}
}
.line {
margin: 24px 0;
margin: 15px 0;
width: 100%;
padding: 0 24px;
box-sizing: border-box;
......@@ -800,9 +830,9 @@ $tableHeight: var(--tableHeight, 550px);
}
}
}
/deep/.el-table tr {
height: 55px;
}
// /deep/.el-table tr {
// height: 55px;
// }
/deep/.el-table th > .cell {
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
......@@ -836,4 +866,5 @@ $tableHeight: var(--tableHeight, 550px);
position: absolute;
right: 0;
}
@import "@/assets/css/globalBase.scss";
</style>
\ No newline at end of file
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-01-11 18:24:00
* @LastEditTime: 2022-01-11 22:36:40
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -118,7 +118,7 @@ module.exports = {
// target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
// target: "http://zwpt.xzclub.top:9333/",
target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.106:8099", // 江
ws: true,
changeOrigin: true,
......
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