Skip to content

F
founder_vue
Commit 3a667cd2 by 张超军
Options

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

parents 4030ea0e 3dfd85da
Showing with 197 additions and 220 deletions
src/netmgr/xtfkgl/xtfkgl.js
......@@ -35,7 +35,7 @@ export default {
* @date: 2022/1/5 11:31
*/
yhList() {
return fHttp.get(_path.ljkyh + 'getUserAndUserGroup', {})
return fHttp.get(_path.ljkyh + 'getUserAndUserGroup')
},
/**
......
src/request/http.js
......@@ -216,7 +216,7 @@ export default {
/**
* 封装get方法
*/
get(url, data) {
get(url, data = {}) {
return new Promise((resolve, reject) => {
common
.get(url, {
......@@ -235,7 +235,7 @@ export default {
/**
* 封装post请求
*/
post(url, data, config) {
post(url, data = {}, config = {}) {
return new Promise((resolve, reject) => {
common.post(url, qs.stringify(data), config)
.then(response => {
......@@ -251,7 +251,7 @@ export default {
/**
* 封装post请求 multipart/form-data
*/
postform(url, data, config) {
postform(url, data = {}, config = {}) {
return new Promise((resolve, reject) => {
instance.post(url, data, config).then(response => {
logger.net(data, url, response)
......@@ -265,7 +265,7 @@ export default {
/**
* 封装post请求 文件下载
*/
postdown(url, data, config) {
postdown(url, data = {}, config = {}) {
return new Promise((resolve, reject) => {
down.post(url, data, config).then(response => {
logger.net(data, url, response)
......@@ -280,7 +280,7 @@ export default {
/**
* 封装post请求 json格式
*/
postJson(url, data, config) {
postJson(url, data = {}, config = {}) {
return new Promise((resolve, reject) => {
json.post(url, data, config).then(response => {
logger.net(data, url, response)
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -659,29 +659,36 @@ export default {
if (this.type == 'aj' && this.rowData.length > 1) {
if (val.includes('7') && val.includes('8')) {
this.bcxh = this.fingerCount + this.palmCount
this.ygsy = (this.syts - this.bcxh) >= 0 ? (this.syts - this.bcxh) : 0
this.$forceUpdate()
} else if (val.includes('8') && val.length == 1) {
this.bcxh = this.palmCount
this.ygsy = (this.syts - this.bcxh) >= 0 ? (this.syts - this.bcxh) : 0
this.$forceUpdate()
} else if (val.includes('7') && val.length == 1) {
this.bcxh = this.fingerCount
this.ygsy = (this.syts - this.bcxh) >= 0 ? (this.syts - this.bcxh) : 0
this.$forceUpdate()
} else {
this.bcxh = 0
this.$forceUpdate()
}
} else {
} else if (this.type == 'aj' && this.rowData.length == 1) {
if (val.includes('7') && val.includes('8')) {
this.bcxh = this.fingerNum + this.palmNum
this.ygsy = (this.syts - this.bcxh) >= 0 ? (this.syts - this.bcxh) : 0
this.$forceUpdate()
} else if (val.includes('8') && val.length == 1) {
this.bcxh = this.palmNum
this.ygsy = (this.syts - this.bcxh) >= 0 ? (this.syts - this.bcxh) : 0
this.$forceUpdate()
} else if (val.includes('7') && val.length == 1) {
this.bcxh = this.fingerNum
this.ygsy = (this.syts - this.bcxh) >= 0 ? (this.syts - this.bcxh) : 0
this.$forceUpdate()
} else {
this.bcxh = 0
this.ygsy = (this.syts - this.bcxh) >= 0 ? (this.syts - this.bcxh) : 0
this.$forceUpdate()
}
}
......@@ -1044,7 +1051,9 @@ export default {
this.totalCount = response.data.detail.totalCount // 本月总数
this.syts = response.data.detail.normalSurplusCount + response.data.detail.highSurplusCount
this.bcxh = this.rowData.length
this.ygsy = (this.syts - this.rowData.length) >= 0 ? (this.syts - this.rowData.length) : 0
if (this.type == "ry") {
this.ygsy = (this.syts - this.rowData.length) >= 0 ? (this.syts - this.rowData.length) : 0
}
this.normalCount = response.data.detail.normalCount
this.normalSurplusCount = response.data.detail.normalSurplusCount
this.highCount = response.data.detail.highCount
......@@ -1071,6 +1080,9 @@ export default {
if (response.data.code === 0) {
this.fingerNum = response.data.ret.length// 单条指纹个数
this.bcxh = response.data.ret.length// 单条指纹个数
if (this.type == "aj") {
this.ygsy = (this.syts - this.bcxh) >= 0 ? (this.syts - this.bcxh) : 0
}
let arr = response.data.ret
let arrNew = []
for (let i = 0; i < arr.length; i++) {
......
src/views/AllPersonnelBase/modules/xzry.vue
......@@ -554,6 +554,32 @@ export default {
watch: {
isShowXzry (newVal, oldVal) {
this.dialogVisible = newVal;
// let self = this
// if (newVal) {
// //监听页面滚动
// this.$nextTick(() => {
// document.querySelector('.el-dialog__body').addEventListener("scroll", (e) => {
// console.log(111111111111)
// // if (e.target.scrollTop > 400) {
// // $('.arrow-down-img').css('transform', 'rotate(180deg)');
// // } else {
// // $('.arrow-down-img').css('transform', 'rotate(0deg)');
// // }
// // let operableTree = setTimeout(() => {
// // self.$refs.referrer.blur()
// // }, 150)
// // clearTimeout(operableTree)
// // this.$refs.cascader.offOption()
// // this.$refs.cascader.dropDownVisible = false
// // this.$refs.cjxxyydm.offOption()
// // this.$refs.cjxxyydm.dropDownVisible = false
// // this.$refs.xbdm.offOption()
// // this.$refs.xbdm.dropDownVisible = false
// // this.$refs.csrq.blur();
// // this.$refs.csrq.pickerVisible = false
// }, false);
// })
// }
},
dialogVisible (val) {
this.$emit("closeXzry", this.dialogVisible);
......@@ -689,6 +715,7 @@ export default {
display: flex;
.el-checkbox {
margin-right: 24px;
margin-bottom: 10px;
}
}
/deep/.el-form {
......@@ -734,7 +761,7 @@ export default {
margin-left: 24px;
}
/deep/.el-dialog__body {
padding: 30px 20px 0;
padding: 30px 5px 0 20px;
}
/deep/.el-dialog__footer {
text-align: center;
......
src/views/Editor/modules/rydaxx.vue
......@@ -560,7 +560,6 @@ export default {
this.$refs.xbdm.dropDownVisible = false
this.$refs.csrq.blur();
this.$refs.csrq.pickerVisible = false
}, false);
})
}
......
src/views/drFPTX/Index.vue
......@@ -571,7 +571,7 @@ export default {
NumId: 1,
isActive:false //选择按钮
isActive: false //选择按钮
}
},
created () {
......@@ -1502,13 +1502,13 @@ export default {
background-color: #e6e6e8;
margin-right: 14px;
}
.text{
.text {
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #006aff;
cursor: pointer;
}
.text:hover{
.text:hover {
color: #51b1f5;
}
}
......@@ -1542,6 +1542,8 @@ export default {
.el-col {
.el-table {
height: 550px;
// background-color: #111;
border-radius: 8px;
}
.head {
......@@ -1643,9 +1645,13 @@ export default {
}
.targetBody {
overflow: hidden;
overflow: auto;
padding-top: 16px;
padding-left: 15px;
width: 100%;
height: 500px;
border-radius: 6px;
// background-color: #111;
/deep/ .el-checkbox {
height: 22px;
......@@ -1656,18 +1662,28 @@ export default {
margin: 5px 0;
}
}
// 滚动条的宽度
/deep/ .targetBody::-webkit-scrollbar {
width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条 必写
}
// 滚动条的滑块
/deep/ .targetBody::-webkit-scrollbar-thumb {
background-color: #dadde0;
border-radius: 3px;
}
}
}
}
.noselected{
background-color:#ECEDF1 !important;
border:none;
color:#AEAFB4;
.noselected {
background-color: #ecedf1 !important;
border: none;
color: #aeafb4;
margin-right: 10px;
}
.selected{
background-color:#055FE7;
color:#FFFFFF;
.selected {
background-color: #055fe7;
color: #ffffff;
margin-right: 10px;
}
.bdbottom {
......@@ -1790,11 +1806,11 @@ export default {
border: 1px solid #d1d1d1;
box-sizing: border-box;
border-top: none;
.targetLeft {
flex: 1;
padding-top: 16px;
padding-left: 20px;
overflow: auto;
/deep/ .el-checkbox {
height: 22px;
......@@ -1806,6 +1822,16 @@ export default {
overflow: hidden;
}
}
// 滚动条的宽度
/deep/ .targetLeft::-webkit-scrollbar {
width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条 必写
}
// 滚动条的滑块
/deep/ .targetLeft::-webkit-scrollbar-thumb {
background-color: #dadde0;
border-radius: 3px;
}
.line {
margin-top: 30px;
......@@ -1818,7 +1844,7 @@ export default {
flex: 1;
padding-top: 16px;
padding-left: 20px;
overflow: auto;
/deep/ .el-checkbox {
height: 22px;
font-size: 14px;
......@@ -1829,6 +1855,16 @@ export default {
overflow: hidden;
}
}
// 滚动条的宽度
/deep/ .targetRight::-webkit-scrollbar {
width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条 必写
}
// 滚动条的滑块
/deep/ .targetRight::-webkit-scrollbar-thumb {
background-color: #dadde0;
border-radius: 3px;
}
}
}
}
......
src/views/xtfkgl/GzlClass.js
......@@ -120,24 +120,19 @@ class Gzlzz {
init(isRy) {
this.isRy = isRy
this.clear()
this.dlmcArr.push(_DL_TYPES.BJDL)
this.dlmcArr.push(_DL_TYPES.CXDL)
if (this.isRy) {
this.dlmcArr.push(_DL_TYPES.BJDL)
this.dlmcArr.push(_DL_TYPES.JCDL)
this.dlmcArr.push(_DL_TYPES.CXDL)
this.dlmcCxdlArr.push(_CXDL_TYPES.DaoC)
this.dlmcCxdlArr.push(_CXDL_TYPES.ChaC)
this.gzdlArr.push(_DL_TYPES.CLDL)
} else {
this.dlmcArr.push(_DL_TYPES.BJDL)
this.dlmcArr.push(_DL_TYPES.CXDL)
this.dlmcCxdlArr.push(_CXDL_TYPES.ZhengC)
this.dlmcCxdlArr.push(_CXDL_TYPES.ChuanC)
this.gzdlArr.push(_DL_TYPES.CLDL)
}
this.gzdlArr.push(_DL_TYPES.CLDL)
this._DL_COUNT = this.dlmcArr.length
}
......
src/views/xtfkgl/GzlDlView.vue deleted 100644 → 0
/**
* Description: 工作流队列相关代码
* @author: li_hongchao
* @date: 2021/12/28 21:07
*/
<template>
<div style="background: #F7F9FB; padding: 30px 0px;">
<el-row style="margin-bottom: 20px;">
<el-col :span="24">
<el-form-item class="dui-lie-ming-cheng-layout" label="队列名称:" prop="dlmc">
<div style="margin-left: 40px;">
<div
class="dui-lie-ming-cheng"
v-for="(item,index) in dlmcArr"
v-show="dlmcArr && dlmcArr.length > 0">
<i class="el-icon-circle-plus icon" style="color: #055fe7"
@click="addDl(item,index)" />
<div>
{{ item.name || '-'}}
<div v-if="item.type === 3">
<span class="line" />
<span v-if="isRy">
<span v-show="item.search === 3 || item.search === 1"
class="tag">倒查</span>
<span v-show="item.search === 3 || item.search === 2"
class="tag">查重</span>
</span>
<span v-else>
<span v-show="item.search === 3 || item.search === 1"
class="tag">正查</span>
<span v-show="item.search === 3 || item.search === 2"
class="tag">串查</span>
</span>
</div>
</div>
</div>
</div>
<div
v-show="!dlmcArr || dlmcArr.length <= 0"
v-for="(item, index) in getDlCount()"
:key="index + 'l'"
class="kong"
></div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item class="gong-zuo-dui-lie-layout" label="工作队列:" prop="gzdl">
<div v-if="gzdlArr && gzdlArr.length > 1">
<!-- 串行模式;-->
<div v-if="ruleForm.gzms === 0"
class="gong-zuo-dui-lie-chuanxing"
v-for="(item,index) in gzdlArr">
<div v-if="index === 0" class="chu-li-dui-lie"
style="margin-left: 0px;">处理队列
</div>
<i v-if="index !== 0" class="el-icon-remove icon"
style="color: #055fe7"
@click="deledeDl(item,index)" />
<div v-if="index !== 0">
{{ item.name || '-'}}
<div v-if="item.type === 3">
<span class="gzdl-line" />
<span v-if="isRy">
<span v-show="item.search === 3 || item.search === 2"
class="gztl-tag chachong">查重</span>
<span v-show="item.search === 3 || item.search === 1"
class="gztl-tag daocha">倒查</span>
</span>
<span v-else>
<span v-show="item.search === 3 || item.search === 1"
class="gztl-tag zhengcha">正查</span>
<span v-show="item.search === 3 || item.search === 2"
class="gztl-tag chuancha">串查</span>
</span>
</div>
</div>
</div>
<!-- 并行模式;-->
<div
v-if="ruleForm.gzms === 1"
v-for="(item,index) in gzdlArr"
:class="{'gong-zuo-dui-lie-bingxing-item':true, kk:index !== 0}">
<div class="gong-zuo-dui-lie-bingxing-item-left">
<div :class="{verLine:true,verLineTrans: index === 0}" />
<div :class="{verLine:true,verLineTrans: index === gzdlArr.length -1}" />
</div>
<div class="gong-zuo-dui-lie-bingxing-item-right">
<span class="mid-line" />
<span class="mid-circle" />
<div v-if="index === 0" class="chu-li-dui-lie"
style="margin-left: 8px;">处理队列
</div>
<div v-else class="gong-zuo-dui-lie-bingxing">
<i class="el-icon-remove icon" @click="deledeDl(item,index)"
style="color: #055fe7" />
<div>
{{ item.name || '-'}}
<div v-if="item.type === 3">
<span class="gzdl-line" />
<span v-if="isRy">
<span v-show="item.search === 3 || item.search === 2"
class="gztl-tag chachong">查重</span>
<span v-show="item.search === 3 || item.search === 1"
class="gztl-tag daocha">倒查</span>
</span>
<span v-else>
<span v-show="item.search === 3 || item.search === 1"
class="gztl-tag zhengcha">正查</span>
<span v-show="item.search === 3 || item.search === 2"
class="gztl-tag chuancha">串查</span>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
<div v-else>
<div class="chu-li-dui-lie">处理队列</div>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</template>
<script>
export default {
name: 'GzlDlView'
}
</script>
<style scoped>
</style>
src/views/xtfkgl/SjkyhSelect.vue
......@@ -88,6 +88,9 @@ export default {
this.userSelectSet = new Set()
this.doQuery()
},
mounted() {
this.updateSelectSet()
},
methods: {
isSelect(item) {
if (this.isYh) {
......@@ -128,6 +131,7 @@ export default {
this.userGroupSelectSet.add(item.id)
}
})
this.$forceUpdate()
},
toggleYh(isyh) {
this.isYh = isyh
......
src/views/xtfkgl/XtfkAndGzlView.vue
......@@ -155,11 +155,10 @@
:style="{marginLeft: gindex===0?'24px':'0px'}">
<div v-if="gindex === 0" class="chu-li-dui-lie"
style="margin-left: 0px;">
<!-- <span style="position: absolute;float:left;top:-4px;left: 10px;color: white">-->
<!-- <img-->
<!-- src="../../assets/img/ljfkgl/ljfk_gzl_num_bg.svg" />-->
<!-- <span style="position: absolute;">{{index+1}}</span>-->
<!-- </span>-->
<!-- <span style="position: absolute;float:left;top:-4px;left: 10px;color: white">-->
<!-- <img src="../../assets/img/ljfkgl/ljfk_gzl_num_bg.svg" />-->
<!-- <span style="position: absolute;">{{index+1}}</span>-->
<!-- </span>-->
处理队列
</div>
<i v-if="gindex !== 0" class="el-icon-remove icon"
......
src/views/xtfkgl/XtfkglMain.vue
......@@ -93,7 +93,7 @@ export default {
},
closeXtfkView(isSuccess) {
closeXtfkView(isSuccess, isRefresh) {
this.isAddFk = false
if (isSuccess && isRefresh) {
if (this.isPerson) {
......
src/views/zljc/Index.vue
......@@ -733,6 +733,14 @@ $tableHeight: var(--tableHeight, 550px);
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #2e3846;
&:hover {
border: 1px solid #055fe7;
color: #055fe7;
}
&:active {
border: 1px solid #044cb9;
color: #044cb9;
}
}
}
.line {
......@@ -800,4 +808,26 @@ $tableHeight: var(--tableHeight, 550px);
font-family: HarmonyOS_Sans_SC;
color: #333333;
}
/deep/.el-pager {
.number {
background-color: transparent;
}
.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;
}
</style>
\ No newline at end of file
src/views/zljc/modules/nyzw.vue
......@@ -786,18 +786,34 @@ export default {
img {
height: 554px;
}
// .tpType {
// position: absolute;
// left: 50%;
// top: 50%;
// transform: translate(-50%, -50%);
// margin-top: -48px; /* 高度的一半 */
// margin-left: -66px; /* 宽度的一半 */
// width: 132px;
// height: 96px;
// z-index: 99;
// img {
// min-width: 232px;
// height: 138px;
// }
// }
.tpType {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
margin-top: -48px; /* 高度的一半 */
margin-left: -66px; /* 宽度的一半 */
width: 132px;
height: 96px;
z-index: 99;
width: 99.7%;
height: 100%;
border-radius: 0 0 8px 8px;
background: rgba(0, 0, 0, 0.4);
img {
min-width: 232px;
position: absolute;
left: 50%;
top: 50%;
margin-top: -69px; /* 高度的一半 */
margin-left: -116px; /* 宽度的一半 */
width: 232px;
height: 138px;
}
}
......@@ -874,16 +890,17 @@ export default {
}
.tpType {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
margin-top: -48px; /* 高度的一半 */
margin-left: -66px; /* 宽度的一半 */
width: 132px;
height: 96px;
z-index: 99;
width: 99.7%;
height: 100%;
border-radius: 0 0 8px 8px;
background: rgba(0, 0, 0, 0.4);
img {
min-width: 232px;
position: absolute;
left: 50%;
top: 50%;
margin-top: -69px; /* 高度的一半 */
margin-left: -116px; /* 宽度的一半 */
width: 232px;
height: 138px;
}
}
......
src/views/zljc/modules/zw.vue
......@@ -416,16 +416,17 @@ export default {
}
.tpType {
position: absolute;
left: 50%;
top: 50%;
transform:translate(-50%,-50%);
margin-top: -48px; /* 高度的一半 */
margin-left: -66px; /* 宽度的一半 */
width: 132px;
height: 96px;
z-index: 99;
width: 99.7%;
height: 100%;
border-radius: 0 0 8px 8px;
background: rgba(0, 0, 0, 0.4);
img {
min-width: 232px;
position: absolute;
left: 50%;
top: 50%;
margin-top: -69px; /* 高度的一半 */
margin-left: -116px; /* 宽度的一半 */
width: 232px;
height: 138px;
}
}
......@@ -500,16 +501,17 @@ export default {
}
.tpType {
position: absolute;
left: 50%;
top: 50%;
transform:translate(-50%,-50%);
margin-top: -48px; /* 高度的一半 */
margin-left: -66px; /* 宽度的一半 */
width: 132px;
height: 96px;
z-index: 99;
width: 99.7%;
height: 100%;
border-radius: 0 0 8px 8px;
background: rgba(0, 0, 0, 0.4);
img {
min-width: 232px;
position: absolute;
left: 50%;
top: 50%;
margin-top: -69px; /* 高度的一半 */
margin-left: -116px; /* 宽度的一半 */
width: 232px;
height: 138px;
}
}
......
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