Skip to content

F
founder_vue
Commit 7f4113ca by 张超军
Options

Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

parents f7e39f29 46ecef2d
Showing with 455 additions and 24 deletions
.env.production
VUE_APP_AUTO_WRITE = pro
VUE_APP_BB_IP = http://10.100.17.124:9080/
VUE_APP_BB_IP = http://8.144.175.212:8080/
VUE_APP_TIBET_HEADER = open
\ No newline at end of file
src/components/Cascader.vue
......@@ -7,9 +7,30 @@
* @FilePath: \founder_vue\src\components\confrim.vue
-->
<template>
<el-tooltip class="item" effect="dark" :content="valStr" :disabled="disable" placement="top-start" :open-delay="1000">
<el-tooltip
class="item"
effect="dark"
:content="valStr"
:disabled="disable"
placement="top-start"
:open-delay="1000"
>
<div :style="{ width: width + 'rem' }">
<el-cascader v-model="form[id]" @click.native="click" :popper-class="'cascader' + ids" ref="cascader" :placeholder="isPlaceholder" @focus="placeholder = $t('Common.please_input')" @blur="placeholder = $t('Common.please_select')" :clearable="clearable" :options="options" :props="props" :show-all-levels="false" @change="change" filterable>
<el-cascader
v-model="form[id]"
@click.native="click"
:popper-class="'cascader' + ids"
ref="cascader"
:placeholder="isPlaceholder"
@focus="placeholder = $t('Common.please_input')"
@blur="placeholder = $t('Common.please_select')"
:clearable="clearable"
:options="options"
:props="props"
:show-all-levels="false"
@change="change"
filterable
>
</el-cascader>
</div>
</el-tooltip>
......@@ -74,9 +95,9 @@ export default {
},
computed: {
isPlaceholder () {
console.log("this.name:"+this.name,"this.id:"+this.id)
console.log("this.form[this.name]:"+this.form[this.name],"this.form[this.id]:"+this.form[this.id])
if(this.name && this.id && this.form[this.name] && this.form[this.id]) {
console.log("this.name:" + this.name, "this.id:" + this.id)
console.log("this.form[this.name]:" + this.form[this.name], "this.form[this.id]:" + this.form[this.id])
if (this.name && this.id && this.form[this.name] && this.form[this.id]) {
document.getElementsByTagName('body')[0].style.setProperty('--placeholderColor', '#606266');
this.valStr = this.form[this.name] + '[' + this.form[this.id] + ']';
console.log(this.valStr);
......@@ -196,7 +217,7 @@ $placeholderColor: var(--placeholderColor, #606266);
}
}
}
/deep/::-webkit-input-placeholder{
color:$placeholderColor;
/deep/::-webkit-input-placeholder {
color: $placeholderColor;
}
</style>
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -69,6 +69,20 @@
</el-input>
</div>
</div>
<div class="right">
<span
style="color: #055fe7;font-size: 0.875rem;margin-right: 0.3125rem;cursor: pointer;"
type="text"
v-show="reqParam.personStoreCustomSearch.ysxtAsjxgrybh != ''||reqParam.personStoreCustomSearch.createTime != ''||reqParam.personStoreCustomSearch.xm != ''||reqParam.personStoreCustomSearch.zjhm != ''"
@click="qk()"
>{{$t('Common.clear_btn')}}</span>
<el-button
type="primary"
class="sx f-primary-button"
@click="search()"
>{{$t('Common.search_btn')}}
</el-button>
</div>
<!-- <el-radio-group
v-model="reqParam.personStoreCustomSearch.searchOptions"
@change="searchStyle"
......@@ -221,8 +235,8 @@
</el-table-column>
<el-table-column
:formatter="dateTimeFormat"
prop="csrq"
:label="$t('Common.csrq')"
prop="createtime"
:label="$t('Common.sarehousing_time')"
:width="width4"
>
</el-table-column>
......@@ -688,6 +702,14 @@ export default {
* @return {*}
*/
selectTime () {
// this.search()
},
// 清空
qk () {
this.reqParam.personStoreCustomSearch.ysxtAsjxgrybh = ''
this.reqParam.personStoreCustomSearch.createTime = []
this.reqParam.personStoreCustomSearch.xm = ''
this.reqParam.personStoreCustomSearch.zjhm = ''
this.search()
},
// 获取全部人员列表请求
......@@ -1368,6 +1390,26 @@ export default {
}
}
}
.right {
width: 175px;
display: flex;
justify-content: flex-end;
align-items: center;
// margin-right: 24px;
/deep/ .sx {
width: 72px;
height: 32px;
background: #055fe7;
border-radius: 4px;
border: none;
color: #fff;
cursor: pointer;
span {
cursor: pointer;
}
}
}
.el-input {
/deep/ .el-input__inner {
......
src/views/AllPersonnelBase/gzlb.vue
......@@ -306,6 +306,13 @@
>
</el-table-column>
<el-table-column
prop="followPerson.comments"
:label="$t('Gz.remarks')"
:width="width5"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
:label="$t('Common.option')"
width="auto"
>
......@@ -446,7 +453,7 @@
<el-table-column
prop="followCase.barcode"
:label="$t('FptxDr.case_number')"
:width="width6"
:width="width2"
show-overflow-tooltip
>
</el-table-column>
......@@ -467,7 +474,14 @@
<el-table-column
prop="followCase.briefCase"
:label="$t('Gzlb.brief_case')"
:width="width5"
:width="width7"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="followCase.comments"
:label="$t('Gz.remarks')"
:width="width7"
show-overflow-tooltip
>
</el-table-column>
......@@ -778,11 +792,12 @@ export default {
height: '33rem',
width1: 50,
width2: 400,
width3: 300,
width4: 200,
width2: 220,
width3: 200,
width4: 100,
width5: 600,
width6: 220,
width6: 200,
width7: 400,
qxgzPopName: 'qxgzPop',
qxgzPopIndex: -1,
}
......@@ -796,6 +811,7 @@ export default {
this.width4 = (this.width4 * w2) / w1
this.width5 = (this.width5 * w2) / w1
this.width6 = (this.width6 * w2) / w1
this.width7 = (this.width7 * w2) / w1
},
watch: {
showType (newNum, oldNum) {
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -39,6 +39,22 @@
>
</el-date-picker>
</div>
<!-- this.reqParam.caseStoreCustomSearchReq.ysxtAsjbh = ''
this.reqParam.caseStoreCustomSearchReq.createTime = [] -->
<div class="right">
<span
style="color: #055fe7;font-size: 0.875rem;margin-right: 0.3125rem;cursor: pointer;"
type="text"
v-show="reqParam.caseStoreCustomSearchReq.ysxtAsjbh != ''||reqParam.caseStoreCustomSearchReq.createTime != ''"
@click="qk()"
>{{$t('Common.clear_btn')}}</span>
<el-button
type="primary"
class="sx f-primary-button"
@click="search()"
>{{$t('Common.search_btn')}}
</el-button>
</div>
<!-- <el-radio-group v-model="reqParam.caseStoreCustomSearchReq.searchOptions">
<el-radio :label="3">通用搜索</el-radio>
<el-radio :label="6">指定条码搜索</el-radio>
......@@ -212,7 +228,7 @@
<el-table-column
prop="tqdwGajgmc"
:label="$t('Allcase.extraction_unit')"
:width="width1"
:width="width5"
show-overflow-tooltip
>
</el-table-column>
......@@ -224,6 +240,13 @@
>
</el-table-column>
<el-table-column
:formatter="dateTimeFormat"
prop="createdate"
:label="$t('Common.sarehousing_time')"
:width="width4"
>
</el-table-column>
<el-table-column
:label="$t('Common.option')"
width="auto"
>
......@@ -514,7 +537,7 @@ export default {
width5: 120,
width4: 150,
width3: 100,
width2: 180,
width2: 150,
width1: 220,
height: '33rem',
isShowAjxxk: false, // 案件信息卡
......@@ -593,6 +616,12 @@ export default {
* @return {*}
*/
selectTime () {
// this.search()
},
// 清空
qk () {
this.reqParam.caseStoreCustomSearchReq.ysxtAsjbh = ''
this.reqParam.caseStoreCustomSearchReq.createTime = []
this.search()
},
// 获取案件数据
......@@ -1235,6 +1264,26 @@ const datas1 = [
color: #606266;
}
}
.right {
width: 830px;
display: flex;
justify-content: flex-end;
align-items: center;
// margin-right: 24px;
/deep/ .sx {
width: 72px;
height: 32px;
background: #055fe7;
border-radius: 4px;
border: none;
color: #fff;
cursor: pointer;
span {
cursor: pointer;
}
}
}
/deep/ .el-input {
/deep/ .el-input__inner {
......
src/views/cxyrd/QueryConfirm.vue
......@@ -881,8 +881,8 @@ export default {
},
// 选择用户下拉框变化时 当前页为1
selectUserInfo () {
this.reqParam.page.currPage = 1
this.searchQuery()
// this.reqParam.page.currPage = 1
// this.searchQuery()
},
// 清空用户id
clearUser () {
......
src/views/tjbb/tjbb.vue
......@@ -300,7 +300,7 @@
</div>
</div>
<div class="content">
<iframe
<!-- <iframe
id="reportFrame"
width="100%"
height="100%"
......@@ -308,7 +308,295 @@
scrolling="auto"
:src="fr_cpt_url"
>
</iframe>
</iframe> -->
<!-- 采集 -->
<el-table
v-if='tpl==1'
:data="tableData"
:header-cell-style="{'text-align':'center',color:'#333333','font-size': '14px','font-family': 'HarmonyOS_Sans_SC_Medium','font-weight': '600','border-color': '#D1D1D1'}"
:cell-style="{'text-align':'center','border-color': '#D1D1D1',padding:'0px'}"
style="width: 100%"
class='cjTable'
>
<el-table-column
prop="date"
label="采集单位"
width="200"
>
</el-table-column>
<el-table-column label="捺印指掌纹">
<el-table-column label="指纹">
<el-table-column
prop="province"
label="当月累计"
>
</el-table-column>
<el-table-column
prop="city"
label="当年累计"
>
</el-table-column>
</el-table-column>
<el-table-column label="掌纹">
<el-table-column
prop="province"
label="当月累计"
>
</el-table-column>
<el-table-column
prop="city"
label="当年累计"
>
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column label="现场指掌纹提取">
<el-table-column label="指纹">
<el-table-column
prop="province"
label="当月累计（起）"
>
</el-table-column>
<el-table-column
prop="city"
label="当年累计（起）"
>
</el-table-column>
<el-table-column
prop="province"
label="当月累计（枚）"
>
</el-table-column>
<el-table-column
prop="city"
label="当年累计（枚）"
>
</el-table-column>
</el-table-column>
<el-table-column label="掌纹">
<el-table-column
prop="province"
label="当月累计"
>
</el-table-column>
<el-table-column
prop="city"
label="当年累计"
>
</el-table-column>
</el-table-column>
</el-table-column>
</el-table>
<!-- 案件 -->
<el-table
v-if='tpl==2'
:data="tableDataAj"
:header-cell-style="{'text-align':'center',color:'#333333','font-size': '14px','font-family': 'HarmonyOS_Sans_SC_Medium','font-weight': '600','border-color': '#D1D1D1'}"
:cell-style="{'text-align':'center','border-color': '#D1D1D1',padding:'0px'}"
style="width: 100%"
>
<el-table-column
prop="date"
label="案事件编号"
width="180"
>
</el-table-column>
<el-table-column
prop="name"
label="指纹个数"
width="180"
>
</el-table-column>
<el-table-column
prop="address"
label="案件类别"
>
</el-table-column>
<el-table-column
prop="address"
label="发案日期"
>
</el-table-column>
<el-table-column
prop="address"
label="发案地点代码"
>
</el-table-column>
<el-table-column
prop="address"
label="发案地点"
>
</el-table-column>
<el-table-column
prop="address"
label="采集单位代码"
>
</el-table-column>
<el-table-column
prop="address"
label="采集单位"
>
</el-table-column>
<el-table-column
prop="address"
label="捺印日期"
>
</el-table-column>
<el-table-column
prop="address"
label="采集人"
>
</el-table-column>
<el-table-column
prop="address"
label="比中标识"
>
</el-table-column>
<el-table-column
prop="address"
label="认定单位"
>
</el-table-column>
<el-table-column
prop="address"
label="上报单位"
>
</el-table-column>
<el-table-column
prop="address"
label="采集人身份证"
>
</el-table-column>
<el-table-column
prop="address"
label="采集人电话"
>
</el-table-column>
</el-table>
<!-- 地市比中 -->
<el-table
v-if='tpl==3'
:data="tableDataAj"
:header-cell-style="{'text-align':'center',color:'#333333','font-size': '14px','font-family': 'HarmonyOS_Sans_SC_Medium','font-weight': '600','border-color': '#D1D1D1'}"
:cell-style="{'text-align':'center','border-color': '#D1D1D1',padding:'0px'}"
style="width: 100%"
>
<el-table-column
prop="date"
label="案事件编号"
width="180"
>
</el-table-column>
<el-table-column
prop="name"
label="现勘编号"
width="180"
>
</el-table-column>
<el-table-column
prop="address"
label="警综案件编号"
>
</el-table-column>
<el-table-column
prop="address"
label="案件类型"
>
</el-table-column>
<el-table-column
prop="address"
label="人员号"
>
</el-table-column>
<el-table-column
prop="address"
label="警综人员编号"
>
</el-table-column>
<el-table-column
prop="address"
label="姓名"
>
</el-table-column>
<el-table-column
prop="address"
label="身份证"
>
</el-table-column>
<el-table-column
prop="address"
label="序号"
>
</el-table-column>
<el-table-column
prop="address"
label="指位"
>
</el-table-column>
<el-table-column
prop="address"
label="查询类型"
>
</el-table-column>
<el-table-column
prop="address"
label="上报部状态"
>
</el-table-column>
<el-table-column
prop="address"
label="比中用户"
>
</el-table-column>
<el-table-column
prop="address"
label="比中单位"
>
</el-table-column>
<el-table-column
prop="address"
label="比中时间"
>
</el-table-column>
<el-table-column
prop="address"
label="比中状态"
>
</el-table-column>
<el-table-column
prop="address"
label="复核用户"
>
</el-table-column>
<el-table-column
prop="address"
label="复核单位"
>
</el-table-column>
<el-table-column
prop="address"
label="复核时间"
>
</el-table-column>
<el-table-column
prop="address"
label="复核状态"
>
</el-table-column>
<el-table-column
prop="address"
label="简要案情"
>
</el-table-column>
<el-table-column
prop="address"
label="上报部流水号"
>
</el-table-column>
</el-table>
</div>
<div
class="block"
......@@ -339,8 +627,19 @@ export default {
components: {
Cascader,
},
created () {
let w1 = 1920
let w2 = window.innerWidth
this.width1 = (this.width1 * w2) / w1
},
data () {
return {
width1: 200,
tableDataAj: [{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
}],
status: 1, // 可视化切换 1或2
props: {
value: "code",
......@@ -949,7 +1248,7 @@ $height: var(--height, 37.5rem);
position: relative;
margin-left: 10px;
&::before {
content: "";
content: '';
display: inline-block;
position: absolute;
left: 0;
......@@ -1021,6 +1320,9 @@ $height: var(--height, 37.5rem);
width: 100%;
// height: 530px;
height: $height;
.cjTable {
}
}
}
.widthAuto /deep/ .el-form-item__content {
......@@ -1405,5 +1707,5 @@ $height: var(--height, 37.5rem);
background-color: #dadde0;
border-radius: 3px;
}
@import "@/assets/css/globalBase.scss";
@import '@/assets/css/globalBase.scss';
</style>
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