Skip to content

F
founder_vue
Commit cfff7daa by 李萌萌
Options

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

parents 08ba5ba6 92a525c3
Showing with 221 additions and 51 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/components/ImageEd.scss
......@@ -21,6 +21,9 @@ $previewHeight_source: var(--previewHeight_source, 100%);
$previewWidth_target: var(--previewWidth_target, 100%);
$previewHeight_target: var(--previewHeight_target, 100%);
// 颜色选择器 -- 标记点
$tuiBrushColorPickerRight: var(--tuiBrushColorPickerRight, 472px);
* {
box-sizing: border-box;
}
......@@ -674,7 +677,7 @@ div {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border: 1px solid #e6e6e8;
position: absolute;
right: 472px;
right: $tuiBrushColorPickerRight; //472px
top: 173px;
/deep/.tui-colorpicker-container {
width: 137px;
......@@ -1185,7 +1188,8 @@ div {
height: 40px;
background: #ffffff;
box-shadow: 0px 2px 4px 0px rgba(5, 95, 231, 0.3),
0px 0px 4px 0px rgba(5, 95, 231, 0.15);
0px 0px 4px 0px rgba(5, 95, 231, 0.15),
inset 0px 0px 4px 0px rgba(5, 95, 231, 0.15);
border-radius: 4px;
display: flex;
align-items: center;
......@@ -1194,6 +1198,37 @@ div {
cursor: pointer;
}
}
.features1 {
img {
width: 23px;
height: 23px;
}
}
.features2 {
img {
width: 26.86px;
height: 27.26px;
}
}
.features3,
.features4 {
img {
width: 24px;
height: 23px;
}
}
.features5 {
img {
width: 32px;
height: 30px;
}
}
.features6 {
img {
width: 28.45px;
height: 20.09px;
}
}
.featuresActive {
width: 40px;
height: 40px;
......@@ -1271,6 +1306,7 @@ div {
.multiply,
.blend,
.brightness {
border-radius: 8px;
z-index: 9;
box-sizing: border-box;
position: absolute;
......@@ -1320,7 +1356,6 @@ div {
text-align: center;
}
}
}
.blend {
width: 137px !important;
......
src/components/ImageEd.vue
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-12-27 15:09:58
* @LastEditTime: 2021-12-28 14:32:15
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
-->
......@@ -111,14 +111,20 @@
</div>
</div>
<el-tooltip class="item" effect="dark" content="下载" :open-delay="500">
<div class="icon download" id="btn-download">
<div class="icon download" id="btn-download" @mousedown="xzActive = false" v-if="xzActive">
<img src="../assets/img/zcedit/download.png" alt="">
</div>
<div class="icon download" id="btn-download_ys" @mouseup="xzActive = true" v-if="!xzActive">
<img src="../assets/img/zcedit/download_a.png" alt="">
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="截屏" :open-delay="500">
<div class="icon screenshot" @click.stop="screenshot">
<div class="icon screenshot" @click.stop="screenshot" @mousedown="jpActive = false" v-if="jpActive">
<img src="../assets/img/zcedit/screenshot.png" alt="">
</div>
<div class="icon screenshot" @click.stop="screenshot" @mouseup="jpActive = true" v-if="!jpActive">
<img src="../assets/img/zcedit/screenshot_a.png" alt="">
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="缩略图" :open-delay="500">
<div class="icon bzd" @click.stop="onchangePreview" v-if="showType == '掌纹'">
......@@ -268,9 +274,12 @@
</div>
</div>
<el-tooltip class="item" effect="dark" content="橡皮擦" :open-delay="500">
<div class="icon rubber" @click.stop="xpcChange">
<div class="icon rubber" @click.stop="xpcChange" @mousedown="xpcActive = false" v-if="xpcActive">
<img src="../assets/img/zcedit/rubber.png" alt="">
</div>
<div class="icon rubber" v-if="!xpcActive" @mouseup="xpcActive = true">
<img src="../assets/img/zcedit/rubber_a.png" alt="">
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="清空" :open-delay="500">
<div class="icon clear" @click.stop="clearChange">
......@@ -475,6 +484,12 @@ export default {
name: "ImageEd",
data () {
return {
// 截屏
jpActive: true,
// 下载
xzActive: true,
// 橡皮擦
xpcActive: true,
// 掌纹缩略图蓝色框，鼠标抬起时设Null，停止平移
dragableDiv: null,
// 判断是否是复核页面
......@@ -2261,8 +2276,10 @@ export default {
if (this.routeName == 'fhxxTL' || this.routeName == 'fhxxLT' || this.routeName == 'fhxxLL') {
this.isFHxx = true
document.getElementsByTagName('body')[0].style.setProperty('--tuiBrushColorPickerRight', '100px');
} else {
this.isFHxx = false
document.getElementsByTagName('body')[0].style.setProperty('--tuiBrushColorPickerRight', '472px');
}
// 更换指掌纹
......
src/plugins/axios.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-16 10:18:36
* @LastEditTime: 2021-12-28 15:00:10
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
......@@ -38,10 +38,10 @@ const _axios = axios.create(config);
_axios.interceptors.request.use(
function (config) {
//判断是否登录
config.headers.BrowserHeader = 'H5';
if (config.url.indexOf('/login/myLoginForm') <= 0) {
if (localStorage.getItem("token")) {
config.headers.Authorization = localStorage.getItem("token");
config.headers.BrowserHeader = 'H5';
}
}
......
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-27 17:28:48
* @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,10 +2126,13 @@ export default {
border-radius: 8px;
border: 1px solid #cccccc;
cursor: pointer;
img {
border-radius: 8px;
}
.img {
object-fit: contain;
margin-top: 35%;
border-radius: 8px;
}
}
......
src/views/bzxxgl/scss/fhxxLT.scss
......@@ -134,13 +134,14 @@
width: 736px;
height: 730px;
background: #f6f8fa;
box-shadow: 0px 1px 2px 0px rgba(5, 95, 231, 0.4), 0px -1px 2px 0px rgba(5, 95, 231, 0.19);
box-shadow: inset 0px 1px 2px 0px rgba(5, 95, 231, 0.4), 0px -1px 2px 0px rgba(5, 95, 231, 0.19);
border-radius: 8px;
.fhxx-title {
font-size: 16px;
font-family: MicrosoftYaHei;
font-weight: bold;
color: #00b48f;
margin-bottom: 15px;
}
.el-textarea /deep/ {
background: #ffffff;
......@@ -154,11 +155,10 @@
}
.scroll-content {
overflow-y: scroll;
height: 675px;
height: 660px;
}
.fhxx-top-top {
display: flex;
margin-top: 15px;
.fhxx-top-top-left {
.fhxx-top-top-left-title {
display: flex;
......
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/cxyrd/modules/LTSrc.vue
......@@ -386,6 +386,7 @@ export default {
self.changeStyle(0, self.enumerate[0]);
} else {
self.$bus.emit('changImageEdit', 'xxx')
self.$bus.emit('changImageEditTarget', 'xxx')
}
})
self.isActive = "";
......
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%;
}
......
src/views/zzwcj/fingerprint.scss
......@@ -2603,6 +2603,7 @@ $versionColor: var(--versionColor, #fff); // #000
margin: 0;
box-sizing: border-box;
.el-dialog__title {
padding-left: 20px;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
......
src/views/zzwcj/fingerprint.vue
......@@ -571,7 +571,7 @@
</div>
<!-- 重复采集弹窗 -->
<div class="repeatDialog">
<el-dialog title="提示" :visible.sync="repeatVisible" width="480px" :modal-append-to-body='false'>
<el-dialog title="提示" :visible.sync="repeatVisible" width="30rem" :modal-append-to-body='false'>
<span>是否重新采集，点击“是”继续采集，点击“否”重采当前指位</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="setRepeat">是</el-button>
......@@ -8315,7 +8315,7 @@ export default {
username: self.username
}
}).then(res => {
//console.log(res);
// console.log(res);
// 上传完成
// self.percentage = 100
// self.isUploadingFinish = true
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-28 09:25:48
* @LastEditTime: 2021-12-28 14:48:42
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -110,15 +110,15 @@ module.exports = {
"/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.104:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
target: "http://192.168.128.119:8099", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// 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://192.168.128.103:8099", // 江
// target: "http://zwpt.xzclub.top:9333/",
target: "http://192.168.128.100:8099", // 江
ws: true,
changeOrigin: true,
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