Skip to content

F
founder_vue
Commit 39d14d43 by 张超军
Options

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

parents a8a74266 69da340d
Showing with 215 additions and 52 deletions
.env.development
VUE_APP_AUTO_WRITE = dev
VUE_APP_BB_IP = http://192.168.128.101:8075/
\ No newline at end of file
.env.production
VUE_APP_AUTO_WRITE = pro
VUE_APP_BB_IP = http://192.168.128.101:8075/
\ No newline at end of file
src/views/tjbb/tjbb.js
......@@ -23,6 +23,7 @@ const cjxxmb = [
{
label: "采集方式：",
type: "select",
id: "code",
selectList: [
{
name: "捺印指纹",
......@@ -33,21 +34,21 @@ const cjxxmb = [
value: "2",
},
],
id: "code",
}
]
const ajxxmb = [
{
label: "提取时间：",
type: "dateValue",
fomat: "yyyy-MM",
fomat: "yyyy-MM-DD",
id: "tqsj",
placeholder: "选择日期",
},
{
label: "入库时间：",
type: "dateValue",
fomat: "yyyy-MM",
fomat: "yyyy-MM-DD",
id: "rksj",
placeholder: "选择日期",
},
......@@ -57,12 +58,12 @@ const ajxxmb = [
id: "unitcode",
placeholder: "选择日期",
},
{
label: "采集方式：",
type: "input",
id: "cjfs",
placeholder: "请输入采集方式",
},
// {
// label: "采集方式：",
// type: "input",
// id: "cjfs",
// placeholder: "请输入采集方式",
// },
{
label: "案事件编号：",
type: "input",
......
src/views/tjbb/tjbb.vue
......@@ -88,8 +88,11 @@
<div class="label">
<span>采集信息统计模版</span>
</div>
<div class="btnBox">
<div>可视化切换</div>
<div
class="btnBox"
v-if="tpl==1"
>
<div @click='ksh'>可视化切换</div>
<div>打印</div>
<div>导出</div>
</div>
......@@ -117,6 +120,7 @@ export default {
},
data () {
return {
status: 1, // 可视化切换 1或2
props: {
value: "code",
label: "key",
......@@ -125,7 +129,7 @@ export default {
emitPath: false,
},
queryParams: {
sj: "",
sj: '',
unitcode: "",
type: [],
},
......@@ -148,7 +152,7 @@ export default {
formTemplate: cjxxmb,
tpl: "1",
fr_cpt_url:
"http://192.168.128.106:8075/webroot/decision/view/report?viewlet=count%252Fcj.cpt&status=1&unitcode=%27540000000000%27&sj=%272022-01%27#/report",
`${process.env.VUE_APP_BB_IP}/webroot/decision/view/report?viewlet=count%252Fcj.cpt&status=1&unitcode=%27540000000000%27&sj=%272022-01%27#/report`,
};
},
mounted () {
......@@ -162,13 +166,112 @@ export default {
this.formTemplate = cjxxmb;
} else if (val == 2) {
this.formTemplate = ajxxmb;
this.queryParams = {
tqsj: "",
rksj: "",
unitcode: '',
// cjfs: '',
asjbh: '',
kybh: '',
}
} else if (val == 3) {
this.formTemplate = dsbzmb;
this.queryParams = {
qzsj: "",
cxlx: "",
ytmh: '',
mbtmh: '',
rddw: '',
}
}
console.log(val);
this.handleQuery()
console.log(this.queryParams, 'queryParamsqueryParamsqueryParams')
},
handleQuery () {
console.log(this.params, this.checked);
if (this.tpl == 1) {
// 采集信息统计模板
let url1 = `${process.env.VUE_APP_BB_IP}webroot/decision/view/report?viewlet=count%252Fcj.cpt&status=${this.status}`
if (this.queryParams.unitcode) {
url1 += `&unitcode=%27${this.queryParams.unitcode}%27`
} else {
url1 += `&unitcode=%27540000000000%27`
// this.queryParams.unitcode = 540000000000
}
if (this.queryParams.sj) {
url1 += `&sj=%27${this.queryParams.sj}%27`
} else {
var now = new Date();
var year = now.getFullYear(); //得到年份
var month = now.getMonth(); //得到月份
var defaultDate = `${year}-${month}`;
url1 += `&sj=%27${defaultDate}%27`
this.queryParams.sj = defaultDate
}
url1 += `#/report`
this.fr_cpt_url = url1;
} else if (this.tpl == 2) {
// 案件信息统计模板
let url2 = `${process.env.VUE_APP_BB_IP}webroot/decision/view/report?viewlet=aj.cpt`
console.log(this.queryParams, 'this.queryParamsthis.queryParamsthis.queryParams')
if (this.queryParams.asjbh) {
url2 += `&asjbh=%27${this.queryParams.asjbh}%27`
}
if (this.queryParams.tqsj) {
url2 += `&tqkssj=%27${this.queryParams.tqsj[0]}%27&tqjssj=%27${this.queryParams.tqsj[1]}%27`
}
if (this.queryParams.rksj) {
url2 += `&rkkssj=%27${this.queryParams.rksj[0]}%27&rkjssj=%27${this.queryParams.rksj[1]}%27`
}
if (this.queryParams.unitcode) {
url2 += `&unitcode=%27${this.queryParams.unitcode}%27`
}
if (this.queryParams.kybh) {
url2 += `&xckybh=%27${this.queryParams.kybh}%27`
}
this.fr_cpt_url = url2;
} else if (this.tpl == 3) {
// 城市比中明细复核统计
let url3 = `${process.env.VUE_APP_BB_IP}webroot/decision/view/report?viewlet=lt.cpt&`
// http://localhost:8075/webroot/decision/view/report?viewlet=lt.cpt&srcbarcode=%27%27&destbarcode=%27%27#/report&op=read
if (this.queryParams.cxlx) {
url3 += `&querytype=%27${this.queryParams.cxlx}%27`
}
if (this.queryParams.rddw) {
url3 += `&unitcode=%27${this.queryParams.rddw}%27`
}
if (this.queryParams.qzsj) {
url3 += `&startTime=%27${this.queryParams.qzsj[0]}%27&endTime=%27${this.queryParams.qzsj[1]}%27`
}
if (this.queryParams.ytmh) {
url3 += `&srcbarcode=%27${this.queryParams.ytmh}%27`
}
if (this.queryParams.mbtmh) {
url3 += `&destbarcode=%27${this.queryParams.mbtmh}%27`
}
url3 += `#/report&op=read`
this.fr_cpt_url = url3;
}
console.log(this.queryParams, 'this.queryParams')
console.log(this.fr_cpt_url, ' this.fr_cpt_url')
},
ksh () {
this.status == 1 ? this.status = 2 : this.status = 1
this.handleQuery()
},
},
computed: {
......
src/views/xtfkgl/AjXtljfkView.vue
......@@ -48,7 +48,8 @@
v-if="scope.row.groups && scope.row.groups.length > 4">
<span style="margin-left: 5px"
@mouseenter.stop="showMoreYhView(scope.$index)">...</span>
@mouseenter.stop="showMoreYhView(scope.$index)"
@mouseout.stop="showMoreYhView(scope.$index,true)">...</span>
<div slot="content" class="tooTipBtn" @mouseover="showMoreYhView(scope.$index)"
@mouseleave="hideMoreYhView()">
......@@ -218,6 +219,7 @@ export default {
document.addEventListener('click', function (e) {
_that.hideMoreYhView()
})
this.getList()
},
methods: {
moveChildView() {
......@@ -227,13 +229,28 @@ export default {
this.isInChildView = false
this.hideMoreYhView()
},
showMoreYhView(index) {
showMoreYhView(index, openTimeOut = false) {
var _that = this
this.isInParentView = true
if (this.curMoreYhViewIndex !== index && this.curMoreYhViewIndex >= 0) {
this.tableDate[this.curMoreYhViewIndex].disabled = false
}
this.tableDate[index].disabled = true
this.curMoreYhViewIndex = index
if (openTimeOut) {
this.isInParentView = false
setTimeout(function () {
if (_that.isInChildView || _that.isInParentView) {
return
}
if (_that.curMoreYhViewIndex >= 0) {
_that.tableDate[_that.curMoreYhViewIndex].disabled = false
}
this.curMoreYhViewIndex = -1
_that.isInParentView = false
_that.isInChildView = false
}, 200)
}
},
hideMoreYhView(isDelay = true) {
let _that = this
......@@ -367,12 +384,13 @@ export default {
.el-table__row > td {
border: none;
}
// 去除table表格最底部边框
.el-table::before {
height: 0px;
}
/deep/.el-table .el-table__header-wrapper tr th {
/deep/ .el-table .el-table__header-wrapper tr th {
background-color: #ecf1f7 !important;
font-size: 14px !important;
font-family: HarmonyOS_Sans_SC_Medium !important;
......@@ -380,42 +398,49 @@ export default {
height: 48px !important;
padding: 0 !important;
}
/deep/.el-table .el-table__body tr.current-row > td {
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: #f2f7fe !important;
}
/deep/.el-table .el-table__body tr:hover > td {
/deep/ .el-table .el-table__body tr:hover > td {
background-color: #f2f7fe !important;
}
/deep/.el-table__row {
/deep/ .el-table__row {
height: 48px !important;
}
/deep/.el-table__row--level-1 {
/deep/ .el-table__row--level-1 {
.el-table__cell {
background-color: #f5f6f7 !important;
}
}
/deep/.el-table th > .cell {
/deep/ .el-table th > .cell {
font-family: HarmonyOS_Sans_SC_Medium;
}
/deep/.el-table .el-table__cell {
/deep/ .el-table .el-table__cell {
padding: 0 !important;
}
/deep/.el-table__body {
/deep/ .el-table__body {
width: 100% !important;
}
// el-table 左侧固定 样式统一
/deep/.el-table__fixed {
/deep/ .el-table__fixed {
height: 100% !important;
&::before {
height: 0;
}
}
/deep/.el-table__fixed-header-wrapper {
/deep/ .el-table__fixed-header-wrapper {
height: 48px !important;
.el-table__header {
width: 100% !important;
height: 48px !important;
......@@ -426,31 +451,37 @@ export default {
height: 3rem !important;
padding: 0 !important;
}
thead {
font-size: 0.875rem !important;
font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282f3c !important;
.cell {
font-weight: normal !important;
}
}
th {
border: none !important;
background-color: #ecf1f7 !important;
}
}
/deep/.hover-row {
/deep/ .hover-row {
.el-table__cell {
background-color: #f2f7fe !important;
}
}
/deep/.el-table__fixed-right {
/deep/ .el-table__fixed-right {
height: 100% !important;
&::before {
height: 0;
}
}
// 批量操作
.el-tag {
color: #055fe7 !important;
......@@ -464,14 +495,17 @@ export default {
display: flex;
align-items: center;
}
/deep/.el-link--inner {
/deep/ .el-link--inner {
color: rgb(5, 95, 231);
}
.icon-tanhao1 {
display: flex;
justify-content: center;
align-items: center;
}
// 表格高度 -- 展示下面的border
.split-line {
height: 650px;
......@@ -479,12 +513,14 @@ export default {
}
// 复选框
/deep/.el-checkbox__inner {
/deep/ .el-checkbox__inner {
cursor: pointer;
}
/deep/.el-checkbox__input {
/deep/ .el-checkbox__input {
line-height: 16px;
}
.search {
/deep/ .el-input__inner {
background: #ffffff;
......@@ -492,40 +528,44 @@ export default {
border-radius: 4px;
border: none;
}
// 输入框选中样式
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus {
/deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:focus {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
border-color: none;
color: #055fe7;
}
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:hover {
/deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
border-color: none;
}
// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效著作权归作者所有。
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus-within {
/deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:focus-within {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
border-color: none;
color: #055fe7;
.el-range-input {
color: #055fe7;
}
}
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:hover {
/deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
border-color: none;
}
}
/deep/.el-input__inner:hover {
/deep/ .el-input__inner:hover {
cursor: text;
}
@import "scss/xtfkgl_main";
</style>
src/views/xtfkgl/RyXtljfkView.vue
......@@ -38,7 +38,6 @@
</div>
</div>
<el-tooltip
:ref="'ryTooltipP'+scope.row.logicId"
class="item"
......@@ -50,7 +49,8 @@
v-if="scope.row.groups && scope.row.groups.length > 4">
<span style="margin-left: 5px"
@mouseenter.stop="showMoreYhView(scope.$index)">...</span>
@mouseenter.stop="showMoreYhView(scope.$index)"
@mouseout.stop="showMoreYhView(scope.$index,true)">...</span>
<div slot="content" class="tooTipBtn" @mouseover="showMoreYhView(scope.$index)"
@mouseleave="hideMoreYhView()">
......@@ -215,13 +215,14 @@ export default {
this.width6 = (this.width6 * w2) / w1
// this.initTestData()
this.getList()
// this.getList()
},
mounted() {
let _that = this
document.addEventListener('click', function (e) {
_that.hideMoreYhView(false)
})
this.getList()
},
methods: {
moveChildView() {
......@@ -231,7 +232,8 @@ export default {
this.isInChildView = false
this.hideMoreYhView()
},
showMoreYhView(index) {
showMoreYhView(index, openTimeOut = false) {
var _that = this
this.isInParentView = true
// logger.info('tooltipParentEnter', 'tooltipParentEnter-' + index)
if (this.curMoreYhViewIndex !== index && this.curMoreYhViewIndex >= 0) {
......@@ -239,7 +241,20 @@ export default {
}
this.tableDate[index].disabled = true
this.curMoreYhViewIndex = index
// logger.info('showMoreYhView-tableDate', this.tableDate)
if (openTimeOut) {
this.isInParentView = false
setTimeout(function () {
if (_that.isInChildView || _that.isInParentView) {
return
}
if (_that.curMoreYhViewIndex >= 0) {
_that.tableDate[_that.curMoreYhViewIndex].disabled = false
}
this.curMoreYhViewIndex = -1
_that.isInParentView = false
_that.isInChildView = false
}, 200)
}
},
hideMoreYhView(isDelay = true) {
let _that = this
......
src/views/xtfkgl/XtfkglMain.vue
......@@ -30,14 +30,14 @@
<!-- 人员逻辑库 -->
<ry-xtljfk-view
ref="ryXtfk"
v-show="isPerson"
v-if="isPerson"
@openBj="openBj"
@openGzl="openGzl"
@openSjgl="openSjgl" />
<!-- 案件逻辑库 -->
<aj-xtljfk-view
ref="ajXtfk"
v-show="!isPerson"
v-if="!isPerson"
@openBj="openBj"
@openGzl="openGzl"
@openSjgl="openSjgl" />
......@@ -85,11 +85,11 @@ export default {
methods: {
toggleView(state) {// true: 显示人员逻辑分库 false ：显示案件逻辑分库
this.isPerson = state
if (this.isPerson) {
this.$refs.ryXtfk.loadData()
} else {
this.$refs.ajXtfk.loadData()
}
// if (this.isPerson) {
// this.$refs.ryXtfk.loadData()
// } else {
// this.$refs.ajXtfk.loadData()
// }
},
addFk() { // 新增分库
this.isAddFk = true
......
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