Commit f01fc28d by liyuhang19990520

bug修改

parent 471cdb1e
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 14:39:52 * @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 * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\main.js * @FilePath: \founder_vue\src\main.js
...@@ -61,6 +61,13 @@ Vue.prototype.$driver = new Driver({ ...@@ -61,6 +61,13 @@ Vue.prototype.$driver = new Driver({
}) })
Vue.prototype.$video = Video 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' import Nsloading from './components/Loading.vue'
......
...@@ -482,7 +482,7 @@ export default { ...@@ -482,7 +482,7 @@ export default {
return; return;
} }
let params = JSON.parse(localStorage.getItem("userInfo")); let params = JSON.parse(localStorage.getItem("userInfo")).user;
for (let key in this.bzr) { for (let key in this.bzr) {
this.bzr[key] = params[key]; this.bzr[key] = params[key];
} }
......
...@@ -75,7 +75,9 @@ ...@@ -75,7 +75,9 @@
> >
清空 清空
</div> </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> </div>
<div class="width100 margin_top24_bottom24 display_style"> <div class="width100 margin_top24_bottom24 display_style">
...@@ -223,7 +225,6 @@ ...@@ -223,7 +225,6 @@
<!-- 自定义列 止 --> <!-- 自定义列 止 -->
<!-- 复制条码号 起 --> <!-- 复制条码号 起 -->
<el-button <el-button
type="info" type="info"
v-if="roleArr.includes('C-1-3')" v-if="roleArr.includes('C-1-3')"
v-clipboard:copy="barcode" v-clipboard:copy="barcode"
...@@ -235,7 +236,6 @@ ...@@ -235,7 +236,6 @@
</el-button> </el-button>
<!-- 复制条码号 止 --> <!-- 复制条码号 止 -->
<el-button <el-button
type="info" type="info"
@click="delMore" @click="delMore"
v-if="roleArr.includes('C-1-4')" v-if="roleArr.includes('C-1-4')"
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
> >
<i <i
class="iconfont icon-tanhao1" 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> ></i>
已选择 已选择
<span style="color: #055fe7">{{ selectionData.length }}</span> 项​ <span style="color: #055fe7">{{ selectionData.length }}</span> 项​
...@@ -564,6 +564,7 @@ export default { ...@@ -564,6 +564,7 @@ export default {
"affirmtime", "affirmtime",
"requestdatetime", "requestdatetime",
"userdesc", "userdesc",
"username",
], ],
defaultTableProps: content, defaultTableProps: content,
//标签数组 //标签数组
...@@ -606,7 +607,7 @@ export default { ...@@ -606,7 +607,7 @@ export default {
expanded: false, // 展开标志 expanded: false, // 展开标志
historyDialogVisible: false, historyDialogVisible: false,
cxyrdWidth1: 200, cxyrdWidth1: 200,
height: '33rem', height: "33rem",
dialogType: "ry", dialogType: "ry",
dialogQid: "", dialogQid: "",
// cxyrdWidth1: sessionStorage.getItem('cxyrdWidth1'), // cxyrdWidth1: sessionStorage.getItem('cxyrdWidth1'),
...@@ -810,7 +811,7 @@ export default { ...@@ -810,7 +811,7 @@ export default {
// clonum.property为当前列的prop值 // clonum.property为当前列的prop值
// row为当前行,是一个类数组对象,可通过[]拿值 // row为当前行,是一个类数组对象,可通过[]拿值
if (prop.endsWith("time")) { 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 { } else {
return row[prop]; return row[prop];
} }
...@@ -1253,8 +1254,9 @@ const content = [ ...@@ -1253,8 +1254,9 @@ const content = [
{ colume: "状态", prop: "queryStateName", width: "auto" }, { colume: "状态", prop: "queryStateName", width: "auto" },
// { colume: "是否删除", prop: "removeFlag", width: "auto" }, // { colume: "是否删除", prop: "removeFlag", width: "auto" },
{ colume: "优先级", prop: "queryclass", width: "auto" }, { colume: "优先级", prop: "queryclass", width: "auto" },
{ colume: "认定时间", prop: "affirmtime", width: "auto" }, { colume: "认定时间", prop: "affirmtime", width: "170" },
{ colume: "发送时间", prop: "requestdatetime", width: "auto" }, { colume: "发送时间", prop: "requestdatetime", width: "170" },
{ colume: "比中概率", prop: "hitpossibility", width: "auto" },
{ colume: "用户名", prop: "username", width: "auto" }, { colume: "用户名", prop: "username", width: "auto" },
]; ];
const setQueryClass = [ const setQueryClass = [
...@@ -1734,8 +1736,8 @@ b { ...@@ -1734,8 +1736,8 @@ b {
color: #055fe7; color: #055fe7;
} }
.el-button--info:active { .el-button--info:active {
border: 1px solid #044CB9; border: 1px solid #044cb9;
color: #044CB9; color: #044cb9;
} }
/deep/.el-checkbox__input.is-checked .el-checkbox__inner, /deep/.el-checkbox__input.is-checked .el-checkbox__inner,
.el-checkbox__input.is-indeterminate .el-checkbox__inner { .el-checkbox__input.is-indeterminate .el-checkbox__inner {
...@@ -1911,17 +1913,17 @@ b { ...@@ -1911,17 +1913,17 @@ b {
} }
/* 滚动槽 */ /* 滚动槽 */
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
-webkit-box-shadow:inset006pxrgba(0,0,0,0.3); -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
border-radius:6px; border-radius: 6px;
} }
/* 滚动条滑块 */ /* 滚动条滑块 */
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
border-radius:6px; border-radius: 6px;
background:#DADDE0; background: #dadde0;
-webkit-box-shadow:inset006pxrgba(0,0,0,0.5); -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.5);
} }
::-webkit-scrollbar-thumb:window-inactive { ::-webkit-scrollbar-thumb:window-inactive {
background:#DADDE0; background: #dadde0;
} }
.el-table__expand-icon { .el-table__expand-icon {
.el-icon-arrow-right { .el-icon-arrow-right {
......
...@@ -1037,6 +1037,8 @@ export default { ...@@ -1037,6 +1037,8 @@ export default {
xm: "", xm: "",
nysj: "", nysj: "",
}, },
//目标选中行数对象
currentRow: null,
}; };
}, },
created() { created() {
...@@ -1471,6 +1473,7 @@ export default { ...@@ -1471,6 +1473,7 @@ export default {
// 目标数据table的选中事件 // 目标数据table的选中事件
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(val); console.log(val);
this.currentRow = val;
if (val) { if (val) {
this.targetObj = val; this.targetObj = val;
val.clickLog = "1"; val.clickLog = "1";
...@@ -1514,7 +1517,7 @@ export default { ...@@ -1514,7 +1517,7 @@ export default {
} }
this.isShowbzDialogBg = true; this.isShowbzDialogBg = true;
this.isShowbzDialog = 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) { for (let key in this.bzr) {
this.bzr[key] = params[key]; this.bzr[key] = params[key];
} }
...@@ -1868,8 +1871,26 @@ export default { ...@@ -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() { mounted() {
//监听按下键切换目标表格的数据
this.$keyBoard(this, "onClickDownUp");
this.finger(); this.finger();
this.$bus.on("ccbarcode", (code) => { this.$bus.on("ccbarcode", (code) => {
this.cleardest(); this.cleardest();
......
...@@ -482,7 +482,7 @@ export default { ...@@ -482,7 +482,7 @@ export default {
return; return;
} }
let params = JSON.parse(localStorage.getItem("userInfo")); let params = JSON.parse(localStorage.getItem("userInfo")).user;
for (let key in this.bzr) { for (let key in this.bzr) {
this.bzr[key] = params[key]; this.bzr[key] = params[key];
} }
......
...@@ -198,7 +198,7 @@ export default { ...@@ -198,7 +198,7 @@ export default {
let self = this; let self = this;
this.qid = this.$route.query.rowData; this.qid = this.$route.query.rowData;
//console.log("源qid====>", this.qid); //console.log("源qid====>", this.qid);
this.userInfo = JSON.parse(localStorage.getItem("userInfo")); this.userInfo = JSON.parse(localStorage.getItem("userInfo")).user;
console.log(this.userInfo); console.log(this.userInfo);
if (this.userInfo) { if (this.userInfo) {
this.bzr = this.userInfo.name; this.bzr = this.userInfo.name;
......
...@@ -193,7 +193,7 @@ export default { ...@@ -193,7 +193,7 @@ export default {
}, },
created() {}, created() {},
mounted() { mounted() {
this.userInfo = JSON.parse(localStorage.getItem("userInfo")); this.userInfo = JSON.parse(localStorage.getItem("userInfo")).user;
console.log(this.userInfo); console.log(this.userInfo);
if (this.userInfo) { if (this.userInfo) {
this.bzr = this.userInfo.name; this.bzr = this.userInfo.name;
......
...@@ -1472,7 +1472,7 @@ export default { ...@@ -1472,7 +1472,7 @@ export default {
} }
this.isShowbzDialogBg = true; this.isShowbzDialogBg = true;
this.isShowbzDialog = 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) { for (let key in this.bzr) {
this.bzr[key] = params[key]; this.bzr[key] = params[key];
} }
......
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