|
|
@@ -28,7 +28,7 @@
|
|
|
<div v-if="index === 2 || index === 3" class="echarts">
|
|
|
<div>
|
|
|
<div v-if="index === 2">按行政区划统计每个机构存在问题数及整改完成率</div>
|
|
|
- <div v-else>按机构统计消防检查与自查完成情况</div>
|
|
|
+ <div v-else>按机构统计消防检查与自查完成情况({{queryParams.para4}}年,监管部门消防安全已检查{{xfaqjcNum}}次)</div>
|
|
|
<el-form ref="bd1formRefs" :model="queryParams" label-width="80px">
|
|
|
<div class="flexBox">
|
|
|
<el-form-item label="检查年度">
|
|
|
@@ -40,6 +40,16 @@
|
|
|
<el-form-item label="机构名称">
|
|
|
<el-input size="mini" v-model="queryParams.para5"></el-input>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item v-if="index === 3" label="检查情况">
|
|
|
+ <el-select v-model="queryParams.para6" placeholder="请选择检查是否合格" clearable>
|
|
|
+ <el-option
|
|
|
+ v-for="dict in options"
|
|
|
+ :key="dict.valueD"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.valueD"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button @click="search1" size="mini" type="primary" icon="el-icon-search">查询</el-button>
|
|
|
<el-button @click="reset" size="mini" type="primary" icon="el-icon-refresh-right">重置</el-button>
|
|
|
@@ -146,6 +156,14 @@ export default {
|
|
|
activeName1: '1',
|
|
|
// 内侧tabs绑定的name
|
|
|
activeName2: '1',
|
|
|
+ options: [{
|
|
|
+ valueD: '是',
|
|
|
+ label: '合格'
|
|
|
+ }, {
|
|
|
+ valueD: '否',
|
|
|
+ label: '不合格'
|
|
|
+ }],
|
|
|
+ valueD: '',
|
|
|
queryParams: {
|
|
|
dictType: 'TJ013',
|
|
|
para1: '1',
|
|
|
@@ -153,10 +171,12 @@ export default {
|
|
|
para3: '1',
|
|
|
para4: '',
|
|
|
para5: null,
|
|
|
+ para6: null,
|
|
|
jgmc: null,
|
|
|
pageNum: 1,
|
|
|
pageSize: 10
|
|
|
},
|
|
|
+ xfaqjcNum:0,
|
|
|
// 分页
|
|
|
total: 1,
|
|
|
fenyeTableList: [],
|
|
|
@@ -199,7 +219,8 @@ export default {
|
|
|
this.queryParams.jgmc = null
|
|
|
this.queryParams.para2 = null
|
|
|
this.queryParams.para4 = this.thisYEar
|
|
|
- this.queryParams.para5 = ''
|
|
|
+ this.queryParams.para5 = null
|
|
|
+ this.queryParams.para6 = null
|
|
|
this.getTableList()
|
|
|
},
|
|
|
// 表格2搜索
|
|
|
@@ -391,6 +412,13 @@ export default {
|
|
|
this.table1Data = []
|
|
|
this.tabdata1 = []
|
|
|
this.tabdata2 = []
|
|
|
+
|
|
|
+ this.queryParams.jgmc = null
|
|
|
+ this.queryParams.para2 = null
|
|
|
+ this.queryParams.para4 = this.thisYEar
|
|
|
+ this.queryParams.para5 = null
|
|
|
+ this.queryParams.para6 = null
|
|
|
+
|
|
|
this.getTableList()
|
|
|
this.table1Data = []
|
|
|
this.tabdata1 = []
|
|
|
@@ -399,6 +427,7 @@ export default {
|
|
|
// 子tabs栏切换事件
|
|
|
handleTabsClick() {
|
|
|
// this.$refs.echartsBox2.getActivename(this.activeName2)
|
|
|
+ this.reset()
|
|
|
this.queryParams.para3 = this.activeName2
|
|
|
this.queryParams.para2 = null
|
|
|
this.formData.keys = []
|
|
|
@@ -421,10 +450,21 @@ export default {
|
|
|
// 获取表格数据
|
|
|
async getTableList() {
|
|
|
this.loading = true
|
|
|
- let retdata = await getstatisticaldata(this.queryParams)
|
|
|
+ const params = {
|
|
|
+ ...this.queryParams,
|
|
|
+ para5: `${this.queryParams.para5}-${this.queryParams.para6}`
|
|
|
+ }
|
|
|
+ let retdata;
|
|
|
+ if(this.queryParams.para1==='4'){
|
|
|
+ retdata = await getstatisticaldata(params);
|
|
|
+ this.xfaqjcNum = retdata.data[2].rowList[0][0];
|
|
|
+ }else{
|
|
|
+ retdata = await getstatisticaldata(this.queryParams)
|
|
|
+ }
|
|
|
this.loading = false
|
|
|
if (retdata.code == 200) {
|
|
|
var data = this.$DBRetToObjA(retdata.data)
|
|
|
+ // console.log(data)
|
|
|
this.formData = data[0]
|
|
|
this.tongjibiaoKeys = data[0].keys
|
|
|
if (this.activeName1 === '1' && this.activeName2 === '1') {
|
