Commit 012cab99 by 刘玉帅

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

parents 5519e930 b9894794
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-08-27 14:14:36 * @Date: 2021-08-27 14:14:36
* @LastEditTime: 2021-09-01 16:32:07 * @LastEditTime: 2021-09-01 18:58:54
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js * @FilePath: \founder_vue\src\router\modules\index.js
...@@ -146,6 +146,16 @@ export default [ ...@@ -146,6 +146,16 @@ export default [
component: () => import("@/views/tjbb/bb.vue"), component: () => import("@/views/tjbb/bb.vue"),
}, },
{ {
path: 'bb2',
name: 'bb2',
hidden: true,
meta: {
title: "报表",
auth: "5"
},
component: () => import("@/views/tjbb/bb2.vue"),
},
{
path: 'dt', path: 'dt',
name: 'dt', name: 'dt',
hidden: true, hidden: true,
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-08-27 14:14:36 * @Date: 2021-08-27 14:14:36
* @LastEditTime: 2021-09-01 16:31:21 * @LastEditTime: 2021-09-01 18:59:34
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\Home.vue * @FilePath: \founder_vue\src\views\Home.vue
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<div class="breadcrumb" v-if="$route.path!='/Home/tjbb' && $route.path!='/Home/sjwgh' && $route.path!='/Home/jxkh' && $route.path!='/Home/tjbb/tb' && $route.path!='/Home/tjbb/bb' && $route.path!='/Home/tjbb/dt'"> <div class="breadcrumb" v-if="$route.path!='/Home/tjbb' && $route.path!='/Home/sjwgh' && $route.path!='/Home/jxkh' && $route.path!='/Home/tjbb/tb' && $route.path!='/Home/tjbb/bb' && $route.path!='/Home/tjbb/bb2' && $route.path!='/Home/tjbb/dt'">
<div @click="goManager" class="home-path path" :class="{active: $route.path=='/Home/rwgl/rwglindex'}">任务管理</div> <div @click="goManager" class="home-path path" :class="{active: $route.path=='/Home/rwgl/rwglindex'}">任务管理</div>
<div class="path" @click="changeRouter(item)" v-for="(item, i) in paths" :key="i" :class="{active: $route.path==item.path}"> <div class="path" @click="changeRouter(item)" v-for="(item, i) in paths" :key="i" :class="{active: $route.path==item.path}">
<span>{{item.name}}</span> <span>{{item.name}}</span>
...@@ -153,7 +153,7 @@ export default { ...@@ -153,7 +153,7 @@ export default {
}, },
watch: { watch: {
$route (newValue, oldValue) { $route (newValue, oldValue) {
if (newValue.path != '/Home/rwgl/rwglindex' && newValue.path != '/Home/tjbb/tb' && newValue.path != '/Home/tjbb/bb' && newValue.path != '/Home/tjbb/dt') { if (newValue.path != '/Home/rwgl/rwglindex' && newValue.path != '/Home/tjbb/tb' && newValue.path != '/Home/tjbb/bb' && newValue.path != '/Home/tjbb/bb2' && newValue.path != '/Home/tjbb/dt') {
if (this.paths.length == 0) { if (this.paths.length == 0) {
this.paths.push({ name: newValue.meta.title, path: newValue.path, routeName: newValue.name }) this.paths.push({ name: newValue.meta.title, path: newValue.path, routeName: newValue.name })
} else { } else {
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-08-28 19:36:38 * @Date: 2021-08-28 19:36:38
* @LastEditTime: 2021-09-01 16:29:06 * @LastEditTime: 2021-09-01 19:47:58
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\rwgl\rwthcl.vue * @FilePath: \founder_vue\src\views\rwgl\rwthcl.vue
...@@ -9,20 +9,10 @@ ...@@ -9,20 +9,10 @@
<template> <template>
<div class="rwthcl"> <div class="rwthcl">
<div class="batch"> <div class="batch">
<el-button type="primary" @click="batchSubmit" plain>批量操作</el-button> <el-input placeholder="请输入内容" v-model="searchVal" class="input-with-select">
<el-button type="text" size="mini" @click="handSerchShow()">{{ MoreisSearch ? "收起" : "更多操作 " }} <el-button slot="append" icon="el-icon-search"></el-button>
</el-input>
<i v-if="!MoreisSearch" class="el-icon-arrow-down el-icon--right"></i>
<i v-else class="el-icon-arrow-up el-icon--right"></i>
</el-button>
</div> </div>
<transition name="slide-fade">
<div class="More" v-if="MoreisSearch">
<el-button type="primary" size="mini">未知操作1</el-button>
<el-button type="primary" size="mini">未知操作2</el-button>
<el-button type="primary" size="mini">未知操作3</el-button>
</div>
</transition>
<Table :cxDefaultFormThead="cxDefaultFormThead" :tableData="tableData" :btnShow="btnShow" @init="handInit(arguments)"> <Table :cxDefaultFormThead="cxDefaultFormThead" :tableData="tableData" :btnShow="btnShow" @init="handInit(arguments)">
</Table> </Table>
</div> </div>
...@@ -36,7 +26,7 @@ export default { ...@@ -36,7 +26,7 @@ export default {
}, },
data () { data () {
return { return {
MoreisSearch: false, searchVal: '',
form: { form: {
name: "", name: "",
userId: "", userId: "",
...@@ -95,17 +85,12 @@ export default { ...@@ -95,17 +85,12 @@ export default {
}; };
}, },
methods: { methods: {
handSerchShow (type) {
this.MoreisSearch = !this.MoreisSearch;
},
resetForm (formName) { resetForm (formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
console.log("重置按钮"); console.log("重置按钮");
}, },
batchSubmit () { }, batchSubmit () { },
/** /**
* @description: 父组件传值 * @description: 父组件传值
* @param {*} msg * @param {*} msg
...@@ -179,31 +164,11 @@ export default { ...@@ -179,31 +164,11 @@ export default {
margin-left: 21px; margin-left: 21px;
} }
.batch { .batch {
height: 79px; margin-top: 20px;
display: flex; margin-left: 24px;
align-items: center; margin-bottom: 20px;
} width: 400px;
.batch {
padding-left: 24px;
.el-button {
padding: 8px 19px;
}
.el-dropdown {
margin-left: 24px;
}
.el-button--primary.is-plain {
border: 1px solid #055fe7;
background: transparent;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055fe7;
}
.el-button--primary.is-plain:focus,
.el-button--primary.is-plain:hover {
background: #409eff;
border-color: #409eff;
color: #fff;
}
} }
} }
</style> </style>
\ No newline at end of file
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-08-28 19:37:47 * @Date: 2021-08-28 19:37:47
* @LastEditTime: 2021-08-31 15:41:57 * @LastEditTime: 2021-09-01 18:57:49
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\tjbb.vue * @FilePath: \founder_vue\src\views\tjbb.vue
...@@ -26,7 +26,8 @@ export default { ...@@ -26,7 +26,8 @@ export default {
return { return {
tabList: [ tabList: [
{ name: '图表', path: '/Home/tjbb/tb' }, { name: '图表', path: '/Home/tjbb/tb' },
{ name: '报表', path: '/Home/tjbb/bb' }, { name: '重点地区来津人员排查统计表', path: '/Home/tjbb/bb' },
{ name: '杨柳青镇街镇江苏重点区域驻留和时空伴随统计表', path: '/Home/tjbb/bb2' },
{ name: '地图', path: '/Home/tjbb/dt' }, { name: '地图', path: '/Home/tjbb/dt' },
] ]
} }
...@@ -65,8 +66,7 @@ export default { ...@@ -65,8 +66,7 @@ export default {
display: flex; display: flex;
.txt { .txt {
cursor: pointer; cursor: pointer;
width: 112px; padding: 9px 42px;
height: 40px;
background: #F6F8FA; background: #F6F8FA;
border-radius: 4px; border-radius: 4px;
display: flex; display: flex;
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-08-31 15:25:02 * @Date: 2021-08-31 15:25:02
* @LastEditTime: 2021-09-01 16:43:54 * @LastEditTime: 2021-09-01 19:23:26
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\tjbb\bb.vue * @FilePath: \founder_vue\src\views\tjbb\bb.vue
...@@ -325,7 +325,7 @@ export default { ...@@ -325,7 +325,7 @@ export default {
} }
.content { .content {
margin-top: 24px; margin-top: 24px;
height: 483px; height: 480px;
.title { .title {
font-size: 16px; font-size: 16px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei; font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
...@@ -344,11 +344,11 @@ export default { ...@@ -344,11 +344,11 @@ export default {
} }
.desc { .desc {
position: relative; position: relative;
top: 400px; top: 390px;
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #666666; color: #666666;
line-height: 19px; // line-height: 19px;
float: right; float: right;
margin-top: 23px; margin-top: 23px;
} }
......
<!--
* @Author: your name
* @Date: 2021-08-31 15:25:02
* @LastEditTime: 2021-09-01 19:39:23
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\tjbb\bb.vue
-->
<template>
<div class="bb">
<div class="header">
<div class="time">
<span class="demonstration">时间选择:</span>
<el-date-picker class="data-picker" v-model="time" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
<el-radio-group v-model="radio" class="select">
<el-radio :label="1">当天</el-radio>
<el-radio :label="2">当月</el-radio>
<el-radio :label="3">当季</el-radio>
</el-radio-group>
</div>
<div class="export">导出</div>
</div>
<div class="content">
<div class="title">杨柳青镇街镇江苏重点区域驻留和时空伴随统计表</div>
<div class="table">
<el-table :data="tableData" max-height="400" style="width: 100%" :span-method="arraySpanMethod" :cell-class-name="addClass" :header-cell-style="headClass">
<el-table-column prop="pc" label="批次" width="150" align="center" fixed>
</el-table-column>
<el-table-column label="推送数" prop="tss" align="center">
</el-table-column>
<el-table-column label="已排查人数" prop="ypcrs" align="center">
</el-table-column>
<el-table-column label="待排查人数" prop="dpcrs" align="center">
<el-table-column label="其中:转外区人数" prop="zwq" align="center">
</el-table-column>
<el-table-column label="其中:本区人数" prop="bq" align="center">
</el-table-column>
</el-table-column>
<el-table-column label="失访" prop="sf" align="center">
</el-table-column>
<el-table-column label="查重" prop="cc" align="center">
</el-table-column>
<el-table-column label="离津" prop="lj" align="center">
</el-table-column>
<el-table-column label="有暴露史人数" prop="yblsrs" align="center">
</el-table-column>
<el-table-column label="核酸阴性人数" prop="hsyxrs" align="center">
</el-table-column>
<el-table-column label="待检测人数" align="center">
<el-table-column prop="zwqrs" label="其中:转外区人数" width="80" align="center">
</el-table-column>
<el-table-column prop="bqrs" label="其中:本区人数" width="80" align="center">
</el-table-column>
</el-table-column>
<el-table-column prop="qz" label="确诊" width="90" align="center">
</el-table-column>
<el-table-column prop="wzzgrz" label="无症状感染者" width="90" align="center">
</el-table-column>
<el-table-column label="正在管控人数(实时数)" align="center">
<el-table-column prop="hj" label="合计" width="100" align="center">
</el-table-column>
<el-table-column prop="jzgl" label="其中:集中隔离" class="redBg" width="100" align="center">
</el-table-column>
<el-table-column prop="jjgl" label="其中:居家隔离" width="100" align="center">
</el-table-column>
<el-table-column prop="jjyxgc" label="其中:居家医学观察" width="100" align="center">
</el-table-column>
</el-table-column>
<el-table-column prop="jjglrs" label="备注" width="90" align="center">
</el-table-column>
</el-table>
</div>
<div class="desc">
铁路民航推送数据累计排查人、排除人、转外省人、失访及其他人、暴漏史人;
</div>
</div>
</div>
</template>
<script>
export default {
data () {
return {
time: '',
radio: 1,
tableData: [{
pc: '53',
tss: '12',
ypcrs: '12',
zwq: '3',
bq: '8',
sf: '4',
cc: '1',
lj: '9',
yblsrs: '14',
hsyxrs: '3',
zwqrs: '6',
bqrs: '16',
qz: '2',
wzzgrz: '42',
hj: '44',
jzgl: '17',
jjgl: '23',
jjyxgc: '36'
}, {
pc: '54',
tss: '23',
ypcrs: '1',
zwq: '13',
bq: '4',
sf: '9',
cc: '11',
lj: '7',
yblsrs: '18',
hsyxrs: '13',
zwqrs: '26',
bqrs: '6',
qz: '21',
wzzgrz: '54',
hj: '12',
jzgl: '13',
jjgl: '31',
jjyxgc: '56'
}, {
pc: '68',
tss: '56',
ypcrs: '11',
zwq: '23',
bq: '14',
sf: '19',
cc: '12',
lj: '17',
yblsrs: '28',
hsyxrs: '23',
zwqrs: '46',
bqrs: '61',
qz: '123',
wzzgrz: '12',
hj: '13',
jzgl: '34',
jjgl: '23',
jjyxgc: '13'
}, {
pc: '71',
tss: '67',
ypcrs: '23',
zwq: '3',
bq: '22',
sf: '11',
cc: '123',
lj: '61',
yblsrs: '21',
hsyxrs: '15',
zwqrs: '26',
bqrs: '12',
qz: '13',
wzzgrz: '23',
hj: '24',
jzgl: '14',
jjgl: '13',
jjyxgc: '33'
}, {
pc: '89',
tss: '99',
ypcrs: '13',
zwq: '23',
bq: '32',
sf: '14',
cc: '13',
lj: '34',
yblsrs: '234',
hsyxrs: '335',
zwqrs: '36',
bqrs: '13',
qz: '33',
wzzgrz: '53',
hj: '214',
jzgl: '124',
jjgl: '123',
jjyxgc: '233'
}, {
pc: '299',
tss: '199',
ypcrs: '123',
zwq: '123',
bq: '1',
sf: '56',
cc: '34',
lj: '12',
yblsrs: '34',
hsyxrs: '35',
zwqrs: '26',
bqrs: '43',
qz: '13',
wzzgrz: '53',
hj: '24',
jzgl: '27',
jjgl: '18',
jjyxgc: '283'
}, {
pc: '102',
tss: '365',
ypcrs: '74',
zwq: '23',
bq: '45',
sf: '111',
cc: '23',
lj: '45',
yblsrs: '123',
hsyxrs: '56',
zwqrs: '262',
bqrs: '323',
qz: '123',
wzzgrz: '23',
hj: '33',
jzgl: '44',
jjgl: '11',
jjyxgc: '66'
}]
}
},
mounted () {
document.querySelector('.el-range-separator').innerHTML = '~';
document.querySelector('.el-range-separator').style.color = '#999';
document.querySelector('.el-range-separator').style.lineHeight = '23px';
document.querySelector('.el-input__icon.el-range__close-icon').style.lineHeight = '26px';
document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.lineHeight = '26px';
document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.position = 'absolute';
document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.right = '5px';
},
updated () {
if(document.querySelector('.el-range-input').value != '') {
document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.display = 'none'
} else {
document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.display = 'block'
}
},
methods: {
/**
* @description: 找到表头设置样式
* @param {*} row
* @param {*} column
* @param {*} rowIndex
* @param {*} columnIndex
* @return {*}
*/
headClass ({ row, column, rowIndex, columnIndex }) {
if (column.label == '阳性人数') {
return 'color: #E02020;'
}
},
/**
* @description: 找到 阳性人数 列,设置样式
* @param {*} row
* @param {*} column
* @param {*} rowIndex
* @param {*} columnIndex
* @return {*}
*/
addClass ({ row, column, rowIndex, columnIndex }) {
if (column.label == '阳性人数') {
return 'redBg'
}
},
arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
if (column.label == '街镇') {
// console.log(column);
if (rowIndex == 0) {
return {
rowspan: 7,
colspan: 1
};
} else {
return {
rowspan: 0,
colspan: 0
};
}
}
}
},
}
</script>
<style lang="scss">
.bb {
box-sizing: border-box;
overflow: hidden;
/deep/ .el-input__icon.el-range__icon.el-icon-date {
position: absolute;
right: 5px;
}
/deep/ .el-date-editor .el-range__icon:hover {
color: #055FE7;
}
.header {
display: flex;
align-items: center;
justify-content: space-between;
.time {
/deep/ .el-date-editor .el-range__icon {
position: absolute;
right: 5px;
}
/deep/ .el-range-separator {
line-height: 26px;
color: #999999;
}
.data-picker {
width: 256px;
height: 32px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999999;
}
/deep/.el-date-editor .el-range__icon {
line-height: 25px;
}
/deep/ .el-range-separator {
color: #999999;
}
.select {
margin-left: 50px;
color: #666666;
/deep/.el-radio {
.el-radio__label {
color: #666;
}
}
/deep/.el-radio.is-checked {
.el-radio__label {
color: #333;
}
}
}
}
.export {
cursor: pointer;
width: 72px;
height: 32px;
background: #055FE7;
border-radius: 4px;
display: flex;
justify-content: center;
align-items: center;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #FFFFFF;
line-height: 16px;
}
}
.content {
margin-top: 24px;
height: 480px;
.title {
font-size: 16px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #333333;
margin-bottom: 16px;
}
.table {
height: 400px;
width: 1520px;
// overflow-y: scroll;
position: absolute;
// overflow: hidden;
}
.redBg {
color: #E02020;
}
.desc {
position: relative;
top: 390px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
// line-height: 19px;
float: right;
margin-top: 23px;
}
}
}
</style>
\ No newline at end of file
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