Skip to content

F
founder_vue
Commit 3dfd85da by li_hongchao
Options

Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

parents 97b2a619 37e87bfa
Showing with 349 additions and 85 deletions
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/xzaj.vue
<template>
<el-dialog title="新增案件" :visible.sync="dialogVisible" width="59.875rem" top="1.25rem" append-to-body :before-close="handleClose" :close-on-click-modal="false" :modal="false">
<el-form :label-position="labelPosition" :inline="true" :model="ruleForm" :rules="rules" ref="ruleForm" class="demo-form-inline">
<el-dialog
title="新增案件"
:visible.sync="dialogVisible"
width="59.875rem"
top="1.25rem"
append-to-body
:before-close="handleClose"
:close-on-click-modal="false"
:modal="false"
>
<el-form
:label-position="labelPosition"
:inline="true"
:model="ruleForm"
:rules="rules"
ref="ruleForm"
class="demo-form-inline"
>
<!-- 一 -->
<el-row class="title">
<div class="colorDiv"></div>
......@@ -9,26 +25,56 @@
<!-- 二 -->
<el-row>
<el-col :span="12">
<el-form-item label="案事件编号：" prop="ysxtAsjbh">
<el-input class="inputBh" v-model.trim="ruleForm.ysxtAsjbh" placeholder="请输入案事件编号" maxlength="22" show-word-limit clearable><template slot="prepend">A</template></el-input>
<el-form-item
label="案事件编号："
prop="ysxtAsjbh"
>
<el-input
class="inputBh"
v-model.trim="ruleForm.ysxtAsjbh"
placeholder="请输入案事件编号"
maxlength="22"
show-word-limit
clearable
><template slot="prepend">A</template></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="警综案事件编号：">
<el-input v-model.trim="ruleForm.asjbh" placeholder="请输入警综案事件编号" maxlength="23" show-word-limit clearable></el-input>
<el-input
v-model.trim="ruleForm.asjbh"
placeholder="请输入警综案事件编号"
maxlength="23"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 三 -->
<el-row>
<el-col :span="12">
<el-form-item label="案事件发生行政区：" prop="asjfsddXzqhdm">
<Cascader :form="ruleForm" id="asjfsddXzqhdm" codeName="CODE_XZQH"></Cascader>
<el-form-item
label="案事件发生行政区："
prop="asjfsddXzqhdm"
>
<Cascader
:form="ruleForm"
id="asjfsddXzqhdm"
codeName="CODE_XZQH"
></Cascader>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="现场勘验编号：">
<el-input class="inputBh" v-model.trim="ruleForm.xckybh" placeholder="请输入现场勘验编号" maxlength="22" show-word-limit clearable><template slot="prepend">K</template></el-input>
<el-input
class="inputBh"
v-model.trim="ruleForm.xckybh"
placeholder="请输入现场勘验编号"
maxlength="22"
show-word-limit
clearable
><template slot="prepend">K</template></el-input>
</el-form-item>
<!-- <el-form-item label="现场掌指纹卡编号：">
<el-input
......@@ -44,13 +90,28 @@
<!-- 四 -->
<el-row>
<el-col :span="12">
<el-form-item label="案事件发生地点：" prop="asjfsddDzmc">
<el-input v-model.trim="ruleForm.asjfsddDzmc" placeholder="请输入案事件发生地点" maxlength="100" show-word-limit clearable></el-input>
<el-form-item
label="案事件发生地点："
prop="asjfsddDzmc"
>
<el-input
v-model.trim="ruleForm.asjfsddDzmc"
placeholder="请输入案事件发生地点"
maxlength="100"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="现场掌指纹卡编号：">
<el-input v-model.trim="ruleForm.xczzhwkbh" placeholder="请输入现场物掌指纹卡编号" maxlength="23" show-word-limit clearable></el-input>
<el-input
v-model.trim="ruleForm.xczzhwkbh"
placeholder="请输入现场物掌指纹卡编号"
maxlength="23"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -58,15 +119,25 @@
<el-row>
<el-col :span="12">
<el-form-item label="发案日期：">
<el-date-picker type="date" placeholder="请选择发案日期" v-model="ruleForm.occurdate" style="width: 100%" :picker-options="{
<el-date-picker
type="date"
placeholder="请选择发案日期"
v-model="ruleForm.occurdate"
style="width: 100%"
:picker-options="{
disabledDate: disabledDate,
}"></el-date-picker>
}"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="案件类别：">
<Cascader :form="ruleForm" id="ajlbdm" codeName="CODE_AJLB"></Cascader>
<Cascader
:form="ruleForm"
id="ajlbdm"
codeName="CODE_AJLB"
></Cascader>
</el-form-item>
</el-col>
......@@ -74,11 +145,20 @@
<el-row>
<el-col :span="12">
<el-form-item label="损失价值(人民币元)：">
<el-input v-model.trim="ruleForm.ssjzrmby" placeholder="请输入损失价值" maxlength="11" show-word-limit clearable></el-input>
<el-input
v-model.trim="ruleForm.ssjzrmby"
placeholder="请输入损失价值"
maxlength="11"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否命案：" prop="sfmaPdbz">
<el-form-item
label="是否命案："
prop="sfmaPdbz"
>
<el-radio-group v-model="ruleForm.sfmaPdbz">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
......@@ -89,7 +169,14 @@
<el-row>
<el-col :span="24">
<el-form-item label="简要案情：">
<el-input resize="none" type="textarea" placeholder="请输入内容" v-model.trim="ruleForm.jyaq" maxlength="4000" show-word-limit>
<el-input
resize="none"
type="textarea"
placeholder="请输入内容"
v-model.trim="ruleForm.jyaq"
maxlength="4000"
show-word-limit
>
</el-input>
</el-form-item>
</el-col>
......@@ -103,7 +190,11 @@
<el-row class="flexBox">
<div style="margin: 15px 0"></div>
<el-checkbox-group v-model="checkedTargets">
<el-checkbox v-for="(value,key) in targets" :key="key" :label="value.code">{{ value.name }}</el-checkbox>
<el-checkbox
v-for="(value,key) in targets"
:key="key"
:label="value.code"
>{{ value.name }}</el-checkbox>
</el-checkbox-group>
</el-row>
<el-divider></el-divider>
......@@ -115,28 +206,61 @@
<!-- 七 -->
<el-row>
<el-col :span="12">
<el-form-item label="提取单位：" prop="tqdwGajgjgdm">
<Cascader :form="ruleForm" id="tqdwGajgjgdm"></Cascader>
<el-form-item
label="提取单位："
prop="tqdwGajgjgdm"
>
<Cascader
:form="ruleForm"
id="tqdwGajgjgdm"
></Cascader>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="提取人姓名：" prop="tqryXm">
<el-input v-model.trim="ruleForm.tqryXm" placeholder="请输入提取人姓名" maxlength="50" show-word-limit clearable></el-input>
<el-form-item
label="提取人姓名："
prop="tqryXm"
>
<el-input
v-model.trim="ruleForm.tqryXm"
placeholder="请输入提取人姓名"
maxlength="50"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 八 -->
<el-row>
<el-col :span="12">
<el-form-item label="提取时间：" prop="tqsj">
<el-date-picker type="datetime" placeholder="请选择提取时间" v-model="ruleForm.tqsj" style="width: 100%" :picker-options="{
<el-form-item
label="提取时间："
prop="tqsj"
>
<el-date-picker
type="datetime"
placeholder="请选择提取时间"
v-model="ruleForm.tqsj"
style="width: 100%"
:picker-options="{
disabledDate: disabledDate,
}"></el-date-picker>
}"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="提取人身份证号：" prop="tqryGmsfhm">
<el-input v-model.trim="ruleForm.tqryGmsfhm" placeholder="请输入提取人身份证号" maxlength="18" show-word-limit clearable></el-input>
<el-form-item
label="提取人身份证号："
prop="tqryGmsfhm"
>
<el-input
v-model.trim="ruleForm.tqryGmsfhm"
placeholder="请输入提取人身份证号"
maxlength="18"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -146,17 +270,32 @@
<el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="提取人联系电话：" prop="tqryLxdh">
<el-input v-model.trim="ruleForm.tqryLxdh" placeholder="请输入提取人联系电话" clearable maxlength="18" show-word-limit></el-input>
<el-form-item
label="提取人联系电话："
prop="tqryLxdh"
>
<el-input
v-model.trim="ruleForm.tqryLxdh"
placeholder="请输入提取人联系电话"
clearable
maxlength="18"
show-word-limit
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-divider></el-divider>
<!-- 十 -->
<span slot="footer" class="dialog-footer">
<span
slot="footer"
class="dialog-footer"
>
<el-button @click="submitForm('ruleForm')">提交并新增指掌纹</el-button>
<el-button @click="resetForm('ruleForm')" type="primary">取 消</el-button>
<el-button
@click="resetForm('ruleForm')"
type="primary"
>取 消</el-button>
</span>
</el-dialog>
</template>
......@@ -385,6 +524,7 @@ export default {
display: flex;
.el-checkbox {
margin-right: 24px;
margin-bottom: 10px;
}
}
/deep/.el-form {
......@@ -430,7 +570,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/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
......@@ -523,7 +523,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/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