Skip to content

F
founder_vue
Commit a016edd4 by 张超军
Options

合并

parents 78a0db88 666646c9
Showing with 148 additions and 33 deletions
src/components/Cascader.vue
<!--
* @Author: your name
* @Date: 2021-11-15 14:15:58
* @LastEditTime: 2021-12-13 11:26:24
* @LastEditTime: 2021-12-28 14:53:19
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\confrim.vue
......@@ -157,9 +157,10 @@ export default {
if (!this.codeName) {
let unidata = this.$store.state.publicData.unitData;
let unicode = this.$store.state.publicData.unitCode;
unicode = unicode.split(",");
if (this.options.length <= 0) {
this.options = this.getTreeData(
unidata.filter((i) => i.code == unicode)
unidata.filter((i) => unicode.includes(i.code))
);
}
} else {
......
src/components/Confirmation.vue
<!--
* @Author: your name
* @Date: 2021-11-15 14:15:58
* @LastEditTime: 2021-12-06 09:53:42
* @LastEditTime: 2021-12-28 12:37:57
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\confrim.vue
......@@ -23,6 +23,7 @@
:hide-icon="true"
confirm-button-text="确认"
@confirm="confirm"
@cancel="$emit('cancel')"
class="icon del"
title="确认要删除该数据吗？该操作无法撤消！"
>
......@@ -35,7 +36,7 @@
</template>
<script>
export default {
data () {
data() {
return {};
},
props: {
......@@ -53,10 +54,10 @@ export default {
},
},
methods: {
confirm () {
this.$emit('onConfirm')
}
}
confirm() {
this.$emit("onConfirm");
},
},
};
</script>
<style lang="scss">
......
src/store/modules/publicData.js
/*
* @Author: your name
* @Date: 2021-11-02 15:41:31
* @LastEditTime: 2021-11-25 17:24:01
* @LastEditTime: 2021-12-28 14:51:22
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\store\modules\user.js
......@@ -11,7 +11,7 @@ const state = {
//所在单位所有json数据
unitData: [],
//用户所在单位code
unitCode: '430000000000',
unitCode: '540000000000,430000000000',
};
const mutations = {
......
src/views/SystemManage/GroupManage.vue
......@@ -41,8 +41,16 @@
multiple
></SelectCode>
</div>
<div class="clear-btn" @click="clear" v-if="newStr">清空</div>
<div class="btn" @click="search('yes')">筛选用户组</div>
<div class="pRight">
<div
class="clear-btn"
@click="clear"
:style="{ visibility: newStr ? '' : 'hidden' }"
>
清空
</div>
<div class="btn" @click="search('yes')">筛选用户组</div>
</div>
</div>
<div class="operation">
<div class="btn1" @click="batch">批量操作</div>
......
src/views/SystemManage/PermissionManage.vue
......@@ -73,8 +73,16 @@
multiple
></SelectCode>
</div>
<div class="clear" @click="userClear" v-if="newStr1">清空</div>
<div class="btn" @click="searchUser('yes')">筛选用户</div>
<div class="pRight">
<div
class="clear"
@click="userClear"
:style="{ visibility: newStr1 ? '' : 'hidden' }"
>
清空
</div>
<div class="btn" @click="searchUser('yes')">筛选用户</div>
</div>
</div>
<!-- 用户表格-->
<div class="table">
......@@ -284,8 +292,16 @@
multiple
></SelectCode>
</div>
<div class="clear" @click="groupClear" v-if="newStr2">清空</div>
<div class="btn" @click="searchGroup('yes')">筛选用户组</div>
<div class="pRight">
<div
class="clear"
@click="groupClear"
:style="{ visibility: newStr2 ? '' : 'hidden' }"
>
清空
</div>
<div class="btn" @click="searchGroup('yes')">筛选用户组</div>
</div>
</div>
<!-- 用户组表格-->
<div class="table">
......
src/views/SystemManage/RoleManage.vue
......@@ -74,6 +74,7 @@
</div>
<Confirmation
@onConfirm="del"
@cancel="cancel"
content="删除"
v-if="delimgBoo"
:hintBoo="true"
......@@ -870,6 +871,10 @@ export default {
this.dataFlag = true;
//console.info("数据权限");
},
cancel() {
this.delimgBoo = !this.delimgBoo;
this.btnCheckList = [];
},
},
created() {
this.search();
......@@ -938,6 +943,12 @@ export default {
}
}
}
#confrim {
position: absolute;
cursor: pointer;
right: 15px;
top: -2px;
}
.delicon {
font-size: 10px;
display: flex !important;
......
src/views/SystemManage/UserManage.vue
......@@ -53,8 +53,16 @@
multiple
></SelectCode>
</div>
<div class="clear-btn" @click="clear" v-if="newStr">清空</div>
<div class="btn" @click="search('yes')">筛选用户</div>
<div class="pRight">
<div
class="clear-btn"
@click="clear"
:style="{ visibility: newStr ? '' : 'hidden' }"
>
清空
</div>
<div class="btn" @click="search('yes')">筛选用户</div>
</div>
</div>
<div class="operation">
<div class="btn1" @click="batch">批量操作</div>
......
src/views/SystemManage/scss/group.scss
......@@ -129,9 +129,15 @@
color: #055fe7;
}
}
.pRight {
position: absolute;
right: 0;
bottom: 3px;
}
.search {
width: 100%;
height: 50px;
position: relative;
.search-item {
width: auto;
height: 32px;
......
src/views/SystemManage/scss/permission.scss
......@@ -74,6 +74,7 @@
width: 100%;
height: 50px;
display: flex;
position: relative;
justify-content: flex-start;
align-items: center !important;
.search-item {
......@@ -214,6 +215,12 @@
}
}
}
.pRight {
position: absolute;
right: 0;
bottom: 50% !important;
transform: translateY(50%);
}
// 用户组
.group {
width: 100%;
......@@ -221,6 +228,7 @@
.search {
width: 100%;
height: 50px;
position: relative;
justify-content: flex-start;
align-items: center;
display: flex;
......
src/views/SystemManage/scss/user.scss
......@@ -87,9 +87,15 @@
color: #055fe7;
}
}
.pRight {
position: absolute;
right: 0;
bottom: 3px;
}
.search {
width: 100%;
height: 50px;
position: relative;
.search-item {
width: auto;
height: 32px;
......
src/views/bzxxgl/fhxxTT.vue
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-28 14:27:49
* @LastEditTime: 2021-12-28 14:55:57
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
......@@ -2059,7 +2059,7 @@ export default {
margin-top: -40px;
width: auto;
height: 700px;
padding-left: 120px;
.data-label {
margin: 0 16px 0 24px;
height: 700px;
......@@ -2100,6 +2100,7 @@ export default {
.finger-data {
margin-top: -10px;
height: 700px;
width: 1500px!important;
//overflow: scroll;
overflow: hidden;
......@@ -2125,7 +2126,9 @@ export default {
border-radius: 8px;
border: 1px solid #cccccc;
cursor: pointer;
img {
border-radius: 8px;
}
.img {
object-fit: contain;
margin-top: 35%;
......
src/views/cxyrd/QueryConfirm.vue
......@@ -3,7 +3,7 @@
<div class="confirm_header_search">
<div
class="width100 margin_top24_bottom24"
style="display: flex; align-items: center"
style="display: flex; align-items: center; position: relative"
>
<div class="display_style">
<span>条码号：</span>
......@@ -64,14 +64,16 @@
>
</el-date-picker>
</div>
<div
class="clear_btn"
@click="clearParams('yes')"
:style="{ visibility: newStr ? '' : 'hidden' }"
>
清空
<div class="pRight">
<div
class="clear_btn"
@click="clearParams('yes')"
:style="{ visibility: newStr ? '' : 'hidden' }"
>
清空
</div>
<el-button type="primary" @click="search">筛选结果</el-button>
</div>
<el-button type="primary" @click="search">筛选结果</el-button>
</div>
<div class="width100 margin_top24_bottom24">
<div class="display_style prevent">
......@@ -237,6 +239,7 @@
</div>
</div>
<el-tag
class="removeDia"
style="width: 100%; color: #666666; margin-bottom: 0.5rem"
v-show="isShowTip"
>
......@@ -367,13 +370,16 @@
<template v-else-if="item.prop === 'barcode'">
<div>
{{ scope.row.barcode }}
<div v-if="scope.row.barcode">
<div v-if="scope.row.barcode && scope.row.querycfg">
<img
class="history"
:src="historyUrl"
@click.stop="getDialog(scope.row)"
/>
</div>
<div v-if="!scope.row.querycfg" class="rgbq">
<p>人工</p>
</div>
</div>
</template>
......@@ -1226,7 +1232,7 @@ const users = [{ username: "张三" }, { username: "李四" }, { username: "赵6
const content = [
// { colume: "任务号", prop: "aid", width: 100 },
// { colume: "查询号", prop: "qqid", width: 100 },
{ colume: "源条码号", prop: "barcode", width: "230" },
{ colume: "源条码号", prop: "barcode", width: "270" },
{ colume: "候选个数", prop: "maxcandidatecnt", width: "auto" },
{ colume: "查询类型", prop: "querytype", width: "auto" },
{ colume: "状态", prop: "queryStateName", width: "auto" },
......@@ -1643,6 +1649,7 @@ b {
font-weight: 350;
color: #333333;
cursor: pointer;
color: #055fe7;
&:hover {
color: #055fe7;
}
......@@ -1669,6 +1676,11 @@ b {
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
.confirm_main_button {
.el-button--info {
margin-right: 0;
}
}
.el-button--info {
width: 96px;
height: 32px;
......@@ -1704,6 +1716,14 @@ b {
width: 100%;
height: 34px;
margin-bottom: 10px;
> div {
&:first-of-type {
.el-button--info {
margin-left: 0;
margin-right: 15px;
}
}
}
}
.confirm_main_button {
position: absolute;
......@@ -1735,7 +1755,7 @@ b {
</style>
<!--table树-->
<style scoped lang="scss">
.tableHeader{
.tableHeader {
> span {
&:last-of-type {
color: #999;
......@@ -1743,6 +1763,23 @@ b {
}
}
}
.rgbq {
padding: 0 5px;
width: 32px;
background: #ddebff;
border-radius: 2px;
font-size: 12px;
color: #055fe7;
}
.pRight {
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%);
}
.removeDia {
width: 1527px !important;
}
.el-table {
/deep/ .el-checkbox {
.is-indeterminate {
......
src/views/cxyrd/TT.vue
......@@ -2157,6 +2157,7 @@ div {
margin-top: -40px;
width: auto;
height: 700px;
padding-left: 120px;
.data-label {
margin: 0 16px 0 24px;
height: 700px;
......@@ -2194,6 +2195,7 @@ div {
.finger-data {
margin-top: -10px;
height: 700px;
width: 1500px!important;
//overflow: scroll;
overflow: hidden;
.hands {
......@@ -2216,8 +2218,10 @@ div {
border-radius: 8px;
border: 1px solid #cccccc;
cursor: pointer;
.img {
img {
border-radius: 8px;
}
.img {
object-fit: contain;
margin-top: 35%;
}
......
src/views/rgrd/rgTT.vue
......@@ -2094,6 +2094,7 @@ div {
margin-top: -40px;
width: auto;
height: 700px;
padding-left: 120px;
.data-label {
margin: 0 16px 0 24px;
height: 700px;
......@@ -2131,6 +2132,7 @@ div {
.finger-data {
margin-top: -10px;
height: 700px;
width: 1500px!important;
//overflow: scroll;
overflow: hidden;
.hands {
......@@ -2153,7 +2155,11 @@ div {
border-radius: 8px;
border: 1px solid #cccccc;
cursor: pointer;
img {
border-radius: 8px;
}
.img {
border-radius: 8px;
object-fit: contain;
margin-top: 35%;
}
......
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