Skip to content

F
founder_vue
Commit 125b8ba6 by 米嘉伟
Options

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

parents b3267ae2 d06326de
Showing with 127 additions and 65 deletions
src/main.js
/*
* @Author: your name
* @Date: 2021-09-07 14:39:52
* @LastEditTime: 2021-11-22 11:15:08
* @LastEditTime: 2022-01-17 15:31:56
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\main.js
......@@ -61,6 +61,13 @@ Vue.prototype.$driver = new Driver({
})
Vue.prototype.$video = Video
//监听键盘事件
Vue.prototype.$keyBoard = function (vm, methodName) {
document.onkeydown = function () {
let key = window.event.keyCode;
vm[methodName](key); // 触发methodName事件
};
}
import Nsloading from './components/Loading.vue'
......
src/views/cxyrd/LL.vue
......@@ -482,7 +482,7 @@ export default {
return;
}
let params = JSON.parse(localStorage.getItem("userInfo"));
let params = JSON.parse(localStorage.getItem("userInfo")).user;
for (let key in this.bzr) {
this.bzr[key] = params[key];
}
......
src/views/cxyrd/QueryConfirm.vue
......@@ -75,7 +75,9 @@
>
清空
</div>
<el-button type="primary" class="f-primary-button" @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">
......@@ -223,7 +225,6 @@
<!-- 自定义列 止 -->
<!-- 复制条码号 起 -->
<el-button
type="info"
v-if="roleArr.includes('C-1-3')"
v-clipboard:copy="barcode"
......@@ -235,7 +236,6 @@
</el-button>
<!-- 复制条码号 止 -->
<el-button
type="info"
@click="delMore"
v-if="roleArr.includes('C-1-4')"
......@@ -251,7 +251,7 @@
>
<i
class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem;"
style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem"
></i>
已选择
<span style="color: #055fe7">{{ selectionData.length }}</span> 项​
......@@ -564,6 +564,7 @@ export default {
"affirmtime",
"requestdatetime",
"userdesc",
"username",
],
defaultTableProps: content,
//标签数组
......@@ -606,7 +607,7 @@ export default {
expanded: false, // 展开标志
historyDialogVisible: false,
cxyrdWidth1: 200,
height: '33rem',
height: "33rem",
dialogType: "ry",
dialogQid: "",
// cxyrdWidth1: sessionStorage.getItem('cxyrdWidth1'),
......@@ -810,7 +811,7 @@ export default {
// clonum.property为当前列的prop值
// row为当前行，是一个类数组对象，可通过[]拿值
if (prop.endsWith("time")) {
return row[prop] ? moment(row[prop]).format("YYYY-MM-DD") : "";
return row[prop] ? moment(row[prop]).format("YYYY-MM-DD HH:mm") : "";
} else {
return row[prop];
}
......@@ -1253,8 +1254,9 @@ const content = [
{ colume: "状态", prop: "queryStateName", width: "auto" },
// { colume: "是否删除", prop: "removeFlag", width: "auto" },
{ colume: "优先级", prop: "queryclass", width: "auto" },
{ colume: "认定时间", prop: "affirmtime", width: "auto" },
{ colume: "发送时间", prop: "requestdatetime", width: "auto" },
{ colume: "认定时间", prop: "affirmtime", width: "170" },
{ colume: "发送时间", prop: "requestdatetime", width: "170" },
{ colume: "比中概率", prop: "hitpossibility", width: "auto" },
{ colume: "用户名", prop: "username", width: "auto" },
];
const setQueryClass = [
......@@ -1734,8 +1736,8 @@ b {
color: #055fe7;
}
.el-button--info:active {
border: 1px solid #044CB9;
color: #044CB9;
border: 1px solid #044cb9;
color: #044cb9;
}
/deep/.el-checkbox__input.is-checked .el-checkbox__inner,
.el-checkbox__input.is-indeterminate .el-checkbox__inner {
......@@ -1911,17 +1913,17 @@ b {
}
/* 滚动槽 */
::-webkit-scrollbar-track {
-webkit-box-shadow:inset006pxrgba(0,0,0,0.3);
border-radius:6px;
-webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
border-radius: 6px;
}
/* 滚动条滑块 */
::-webkit-scrollbar-thumb {
border-radius:6px;
background:#DADDE0;
-webkit-box-shadow:inset006pxrgba(0,0,0,0.5);
border-radius: 6px;
background: #dadde0;
-webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.5);
}
::-webkit-scrollbar-thumb:window-inactive {
background:#DADDE0;
background: #dadde0;
}
.el-table__expand-icon {
.el-icon-arrow-right {
......
src/views/cxyrd/TT.vue
......@@ -1037,6 +1037,8 @@ export default {
xm: "",
nysj: "",
},
//目标选中行数对象
currentRow: null,
};
},
created() {
......@@ -1471,6 +1473,7 @@ export default {
// 目标数据table的选中事件
handleCurrentChange(val) {
console.log(val);
this.currentRow = val;
if (val) {
this.targetObj = val;
val.clickLog = "1";
......@@ -1514,7 +1517,7 @@ export default {
}
this.isShowbzDialogBg = true;
this.isShowbzDialog = true;
let params = JSON.parse(localStorage.getItem("userInfo"));
let params = JSON.parse(localStorage.getItem("userInfo")).user;
for (let key in this.bzr) {
this.bzr[key] = params[key];
}
......@@ -1868,8 +1871,26 @@ export default {
});
}
},
onClickDownUp(code) {
if (!this.$store.state.loading.loading_sd && this.currentRow) {
let index = this.tableData.findIndex(
(i) => JSON.stringify(i) == JSON.stringify(this.currentRow)
);
if (code == 40) {
if (index < this.tableData.length - 1) {
this.$refs.singleTable.setCurrentRow(this.tableData[index + 1]);
}
} else if (code == 38) {
if (index > 0) {
this.$refs.singleTable.setCurrentRow(this.tableData[index - 1]);
}
}
}
},
},
mounted() {
//监听按下键切换目标表格的数据
this.$keyBoard(this, "onClickDownUp");
this.finger();
this.$bus.on("ccbarcode", (code) => {
this.cleardest();
......
src/views/rgrd/rgLL.vue
......@@ -482,7 +482,7 @@ export default {
return;
}
let params = JSON.parse(localStorage.getItem("userInfo"));
let params = JSON.parse(localStorage.getItem("userInfo")).user;
for (let key in this.bzr) {
this.bzr[key] = params[key];
}
......
src/views/rgrd/rgLT.vue
......@@ -198,7 +198,7 @@ export default {
let self = this;
this.qid = this.$route.query.rowData;
//console.log("源qid====>", this.qid);
this.userInfo = JSON.parse(localStorage.getItem("userInfo"));
this.userInfo = JSON.parse(localStorage.getItem("userInfo")).user;
console.log(this.userInfo);
if (this.userInfo) {
this.bzr = this.userInfo.name;
......
src/views/rgrd/rgTL.vue
......@@ -193,7 +193,7 @@ export default {
},
created() {},
mounted() {
this.userInfo = JSON.parse(localStorage.getItem("userInfo"));
this.userInfo = JSON.parse(localStorage.getItem("userInfo")).user;
console.log(this.userInfo);
if (this.userInfo) {
this.bzr = this.userInfo.name;
......
src/views/rgrd/rgTT.vue
......@@ -1472,7 +1472,7 @@ export default {
}
this.isShowbzDialogBg = true;
this.isShowbzDialog = true;
let params = JSON.parse(localStorage.getItem("userInfo"));
let params = JSON.parse(localStorage.getItem("userInfo")).user;
for (let key in this.bzr) {
this.bzr[key] = params[key];
}
......
src/views/zzwcj/fingerprint.scss
......@@ -67,16 +67,26 @@ $pichover: var(--pichover, #cccccc); //#909090 #D6DBE1 深浅主题hover变颜
$pichoverShadow: var(--pichoverShadow , 0px 10px 20px 2px rgba(0, 21, 51, 0.08)); //默认hover为加阴影
$picSelected: var(--picSelected ,#0060F0); //选中边框色
$boxdesc: var(--boxdesc,#666660 ); //#dddddd #21272A
$anaphoraBg: var(--anaphoraBg, #1b1b1b); // #D6DBE1
$anaphoraBg: var(--anaphoraBg,#ffffff ); //#1b1b1b #D6DBE1 //补采的背景
$bucai: var(--bucai,#ffffff); //补采两个字
// 按钮
$btnBorder: var(--btnBorder, #AEB5C2 ); //#464646 #979FA8
$btnfontColor: var(--btnfontColor,#2E3846); // #efefef #343A3F
$btnhover: var(--btnhover, #efefef); // #4A4E52
// 弹出对话框
$btndialogBg: var(--btndialogBg, #535353); // #E7EAEE
$btndialogTitle: var(--btndialogTitle, #ffc005); // #323942
$btndialogbodyBg: var(--btndialogbodyBg, #3f3f3f); // #CCD2D8
$btndialogbodyTxt: var(--btndialogbodyTxt, #dddddd); // #222222
$btndialogBg: var(--btndialogBg,#F6F8FA ); //#535353 #E7EAEE
$btndialogTitle: var(--btndialogTitle,#333333 ); //#ffc005 #323942
$btndialogbodyBg: var(--btndialogbodyBg,#ffffff ); //#3f3f3f #CCD2D8
$btndialogbodyTxt: var(--btndialogbodyTxt,#282F3C ); //#dddddd #222222
$btndialogPrimary:var(--btndialogPrimary,#282f3c);//是
$btndialogPrimaryHover:var(--btndialogPrimaryHover,#0060f0);
$btndialogPrimaryHoverBorder:var(--btndialogPrimaryHoverBorder,#0060f0);
$btndialogPrimaryBg:var(--btndialogPrimaryBg,#ffffff);
$btndialogDefault: var(--btndialogDefault,#ffffff);//否
$btndialogDefaultBg:var(--btndialogDefaultBg,#0060F0);
$btndialogDefaultBgHover:var(--btndialogDefaultBgHover,#377FEC);
$btndialogDefaultHoverBorder:var(--btndialogDefaultHoverBorder,#377FE7);
$btndialogBorder:var(--btndialogBorder,#AEB5C2);//是否的边框
// 设置对话框
$settingTitle: var(--settingTitle,#323232 ); //#333333 #323942
$settingHeadBg: var(--settingHeadBg, #F6F8FA ); //#dddddd #E7EAEE
......@@ -130,6 +140,9 @@ $lookingBg: var(--lookingBg, #fff);//#161712
$dashBorder: var(--dashBorder ,#979797);
$lookingBorder: var(--lookingBorder,#cccccc);
// 上传时的边框
$uploadingBg:var(--uploadingBg,#ffffff); //上传时背景
$uploadingContentBorder:var(--uploadingContentBorder,#ffffff); //方块边框
$uploadingProgressText: var(--uploadingProgressText, #333333);//百分比颜色
$uploadingBorder: var(--uploadingBorder, 0); // 2px
// el-dialog背景色
......@@ -1272,7 +1285,7 @@ $versionColor: var(--versionColor, #000); // #000
font-family: HarmonyOS_Sans_SC;
font-weight: bold;
line-height: 20px;
color: #1b1b1b;
color: $bucai;
border-top-left-radius: 10px;
}
.score.fail {
......@@ -1288,7 +1301,7 @@ $versionColor: var(--versionColor, #000); // #000
font-family: HarmonyOS_Sans_SC;
font-weight: bold;
line-height: 20px;
color: #1b1b1b;
color: $bucai;
border-top-left-radius: 10px;
}
.pic.fail {
......@@ -1308,7 +1321,7 @@ $versionColor: var(--versionColor, #000); // #000
font-family: HarmonyOS_Sans_SC;
font-weight: bold;
line-height: 20px;
color: #1b1b1b;
color: $bucai;
border-top-left-radius: 10px;
}
img {
......@@ -1336,7 +1349,7 @@ $versionColor: var(--versionColor, #000); // #000
font-family: HarmonyOS_Sans_SC;
font-weight: bold;
line-height: 20px;
color: #1b1b1b;
color: $bucai;
border-top-left-radius: 10px;
}
img {
......@@ -1441,7 +1454,7 @@ $versionColor: var(--versionColor, #000); // #000
background: #e82510;
font-family: HarmonyOS_Sans_SC;
font-size: 12px;
color: #000000;
color: $bucai;
border-radius: 1px 0px 8px 0px;
border: 1px solid #e82510;
left: 0;
......@@ -1466,6 +1479,14 @@ $versionColor: var(--versionColor, #000); // #000
}
}
.btns-dialog {
/deep/.el-dialog__title {
font-size: 16px;
font-family: HarmonyOS_Sans_SC;
font-weight: 400;
line-height: 21px;
color: $btndialogTitle;
margin-left: 28px;
}
/deep/ .el-dialog {
border-radius: 6px 6px 0px 0px;
}
......@@ -1482,14 +1503,6 @@ $versionColor: var(--versionColor, #000); // #000
padding: 0;
margin: 0;
box-sizing: border-box;
/deep/.el-dialog__title {
font-size: 16px;
font-family: HarmonyOS_Sans_SC;
font-weight: 400;
line-height: 21px;
color: $btndialogTitle;
margin-left: 28px;
}
.el-dialog__headerbtn {
top: 14px;
right: 16px;
......@@ -1515,39 +1528,55 @@ $versionColor: var(--versionColor, #000); // #000
}
}
/deep/ .el-dialog__footer {
background-color: $btndialogbodyBg;
// background-color: $btndialogbodyBg;
padding-bottom: 20px !important;
padding-right: 20px !important;
.dialog-footer {
.el-button.el-button--default {
width: 30px;
height: 20px;
width: 88px;
height: 32px;
border:1px solid $btndialogBorder;
border-radius: 18px;
background: $btndialogDefaultBg !important;
span {
font-size: 15px;
font-family: HarmonyOS_Sans_SC;
font-weight: 400;
line-height: 20px;
color: $btndialogbodyTxt;
color: $btndialogDefault;
}
}
.el-button.el-button--primary {
width: 88px;
height: 32px;
background: $btndialogBg;
width: 88px !important;
height: 32px !important;
background: $btndialogPrimaryBg;
opacity: 1;
border: none;
// border: none;
border-radius: 18px;
border:1px solid $btndialogBorder;
span {
cursor: pointer;
font-size: 15px;
font-family: HarmonyOS_Sans_SC;
font-weight: 400;
line-height: 20px;
color: $btndialogbodyTxt;
color: $btndialogPrimary;
}
}
.el-button.el-button--primary:hover {
border: 1px solid $btndialogbodyTxt;
border: 1px solid $btndialogPrimaryHoverBorder;
span{
color:$btndialogPrimaryHover
}
}
.el-button.el-button--default:hover {
border: 1px solid $btndialogDefaultHoverBorder;
background:$btndialogDefaultBgHover !important
// span{
// color:$btndialogDefaultBg
// }
}
}
}
......@@ -2386,12 +2415,12 @@ $versionColor: var(--versionColor, #000); // #000
box-sizing: border-box;
display: flex;
align-items: center;
.el-dialog__title {
/deep/.el-dialog__title {
font-size: 16px;
font-family: HarmonyOS_Sans_SC;
font-weight: 400;
line-height: 21px;
color: $settingTitle;
color: $btndialogTitle;
}
.el-dialog__headerbtn {
display: none;
......@@ -2657,6 +2686,14 @@ $versionColor: var(--versionColor, #000); // #000
/deep/ .el-dialog {
border-radius: 6px 6px 0px 0px;
}
/deep/.el-dialog__title {
padding-left: 20px;
font-size: 16px;
font-family: HarmonyOS_Sans_SC;
font-weight: 400;
line-height: 21px;
color: $btndialogTitle !important;
}
/deep/ .el-dialog__header {
width: 480px;
height: 39px;
......@@ -2670,14 +2707,7 @@ $versionColor: var(--versionColor, #000); // #000
padding: 0;
margin: 0;
box-sizing: border-box;
.el-dialog__title {
padding-left: 20px;
font-size: 16px;
font-family: HarmonyOS_Sans_SC;
font-weight: 400;
line-height: 21px;
color: $btndialogTitle;
}
.el-dialog__headerbtn {
top: 14px;
right: 16px;
......@@ -2748,10 +2778,11 @@ $versionColor: var(--versionColor, #000); // #000
justify-content: center;
align-items: center;
/deep/.el-progress__text {
color: #fff;
color: $uploadingProgressText;
}
// .el-progress-circle
/deep/.el-progress-circle__track {
stroke: #333;
stroke: #f66;
}
.pro {
border: $uploadingBorder solid #26d31f;
......@@ -2834,9 +2865,10 @@ $versionColor: var(--versionColor, #000); // #000
.uploading-content {
width: 480px;
height: 286px;
background: #3f3f3f;
// background: #3f3f3f;
background:$uploadingBg;
border-radius: 0px 0px 4px 4px;
border: 1px solid #535353;
border: 1px solid $uploadingContentBorder;
display: flex;
justify-content: center;
align-items: center;
......
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