Skip to content

H
huaxin-rq
Commit 50cd2370 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

安检任务 查询及隐患隐藏显示修改

parent d9e5071a
Show whitespace changes
Inline Side-by-side
Showing with 162 additions and 20 deletions
huaxin-web/src/views/checktask/inspect/cyindex.vue
View file @ 50cd2370
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</el-button> </el-button>
<div class="top flex-b"> <div class="top flex-b">
<div class="l top-item bb"> <div class="l top-item bb" :class="{ 'top-item-open': !dangerShow }">
<div class="t">{{ taskDetailData.title }}</div> <div class="t">{{ taskDetailData.title }}</div>
<div class="m bb"> <div class="m bb">
<span class="sl">任务起止时间</span> <span class="sl">任务起止时间</span>
...@@ -27,10 +27,10 @@ ...@@ -27,10 +27,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="m top-item bb"> <div class="m top-item bb" :class="{ 'top-item-open': !dangerShow }">
<div class="t">任务进度</div> <div class="t">任务进度</div>
<div class="b flex-b bb"> <div class="b flex-b bb">
<div v-for="item in itemDataA" :key="item.label" class="bottom-item"> <div v-for="item in itemDataA" :key="item.label" class="bottom-item" @click="queryItem(item.inspectStatus)">
<div <div
:style="{ :style="{
background: `url(${item.src}) no-repeat center`, background: `url(${item.src}) no-repeat center`,
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="r top-item bb"> <div class="r top-item bb" v-show="dangerShow">
<div class="t">隐患信息</div> <div class="t">隐患信息</div>
<div class="flex-b m bb"> <div class="flex-b m bb">
<div>存在隐患</div> <div>存在隐患</div>
...@@ -176,6 +176,15 @@ ...@@ -176,6 +176,15 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button >重置</el-button
> >
<el-button
icon="el-icon-document"
size="mini"
type="info"
@click="dangerShow=!dangerShow"
>
隐患信息
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -435,30 +444,35 @@ export default { ...@@ -435,30 +444,35 @@ export default {
val: 2109, val: 2109,
src: imgA, src: imgA,
color: "#2167E5", color: "#2167E5",
inspectStatus: -1
}, },
{ {
label: "到访不遇", label: "到访不遇",
val: 21, val: 21,
src: imgA, src: imgA,
color: "#2167E5", color: "#2167E5",
inspectStatus: 0
}, },
{ {
label: "拒绝安检", label: "拒绝安检",
val: 3, val: 3,
src: imgB, src: imgB,
color: "#E22121", color: "#E22121",
inspectStatus: 1
}, },
{ {
label: "表前安检", label: "燃气停用",
val: 4, val: 4,
src: imgA, src: imgA,
color: "#2167E5", color: "#2167E5",
inspectStatus: 3
}, },
{ {
label: "已安检", label: "已安检",
val: 1209, val: 1209,
src: imgC, src: imgC,
color: "#08932D", color: "#08932D",
inspectStatus: 2
}, },
], ],
// //
...@@ -471,7 +485,8 @@ export default { ...@@ -471,7 +485,8 @@ export default {
typeOptions: [], typeOptions: [],
ustatusOptions: [], ustatusOptions: [],
taskDetailData:{}, taskDetailData:{},
taskInspectDangerDetailData:{} taskInspectDangerDetailData:{},
dangerShow: false
}; };
}, },
created() { created() {
...@@ -678,6 +693,12 @@ export default { ...@@ -678,6 +693,12 @@ export default {
} }
}) })
}, },
//任务进度查询
queryItem(inspectStatus){
this.resetForm("queryForm");
this.queryParams.inspectStatus = inspectStatus;
this.handleQuery();
}
}, },
}; };
</script> </script>
...@@ -749,6 +770,7 @@ export default { ...@@ -749,6 +770,7 @@ export default {
} }
.b { .b {
.bottom-item { .bottom-item {
cursor: pointer;
.imgbg { .imgbg {
width: 80px; width: 80px;
height: 56px; height: 56px;
...@@ -801,5 +823,9 @@ export default { ...@@ -801,5 +823,9 @@ export default {
} }
} }
} }
.top-item-open{
width: 826px !important;
}
} }
</style> </style>
huaxin-web/src/views/checktask/inspect/index.vue
View file @ 50cd2370
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</el-button> </el-button>
<div class="top flex-b"> <div class="top flex-b">
<div class="l top-item bb"> <div class="l top-item bb" :class="{ 'top-item-open': !dangerShow }">
<div class="t">{{ taskDetailData.title }}</div> <div class="t">{{ taskDetailData.title }}</div>
<div class="m bb"> <div class="m bb">
<span class="sl">任务起止时间</span> <span class="sl">任务起止时间</span>
...@@ -27,10 +27,10 @@ ...@@ -27,10 +27,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="m top-item bb"> <div class="m top-item bb" :class="{ 'top-item-open': !dangerShow }">
<div class="t">任务进度</div> <div class="t">任务进度</div>
<div class="b flex-b bb"> <div class="b flex-b bb">
<div v-for="item in itemDataA" :key="item.label" class="bottom-item"> <div v-for="item in itemDataA" :key="item.label" class="bottom-item" @click="queryItem(item.query.param,item.query.value)">
<div <div
:style="{ :style="{
background: `url(${item.src}) no-repeat center`, background: `url(${item.src}) no-repeat center`,
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="r top-item bb"> <div class="r top-item bb" v-show="dangerShow">
<div class="t">隐患信息</div> <div class="t">隐患信息</div>
<div class="flex-b m bb"> <div class="flex-b m bb">
<div>存在隐患</div> <div>存在隐患</div>
...@@ -207,6 +207,15 @@ ...@@ -207,6 +207,15 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button >重置</el-button
> >
<el-button
icon="el-icon-document"
size="mini"
type="info"
@click="dangerShow=!dangerShow"
>
隐患信息
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -465,48 +474,77 @@ export default { ...@@ -465,48 +474,77 @@ export default {
val: 0, val: 0,
src: imgA, src: imgA,
color: "#2167E5", color: "#2167E5",
query:{
param: "inspectStatus",
value: -1
}
}, },
{ {
label: "到访不遇1", label: "到访不遇1",
val: 0, val: 0,
src: imgA, src: imgA,
color: "#2167E5", color: "#2167E5",
query:{
param: "missNum",
value: 1
}
}, },
{ {
label: "到访不遇2", label: "到访不遇2",
val: 0, val: 0,
src: imgA, src: imgA,
color: "#2167E5", color: "#2167E5",
query:{
param: "missNum",
value: 2
}
}, },
{ {
label: "到访不遇3", label: "到访不遇3",
val: 0, val: 0,
src: imgA, src: imgA,
color: "#2167E5", color: "#2167E5",
query:{
param: "missNum",
value: 3
}
}, },
{ {
label: "拒绝安检", label: "拒绝安检",
val: 0, val: 0,
src: imgB, src: imgB,
color: "#E22121", color: "#E22121",
query:{
param: "inspectStatus",
value: 1
}
}, },
{ {
label: "燃气停用", label: "燃气停用",
val: 0, val: 0,
src: imgA, src: imgA,
color: "#2167E5", color: "#2167E5",
query:{
param: "inspectStatus",
value: 3
}
}, },
{ {
label: "已安检", label: "已安检",
val: 0, val: 0,
src: imgC, src: imgC,
color: "#08932D", color: "#08932D",
query:{
param: "inspectStatus",
value: 2
}
}, },
], ],
taskDetailData:{}, taskDetailData:{},
taskInspectDangerDetailData:{}, taskInspectDangerDetailData:{},
communityInfos: [], communityInfos: [],
inspectTimeRange: [] inspectTimeRange: [],
dangerShow: false
}; };
}, },
created() { created() {
...@@ -534,7 +572,6 @@ export default { ...@@ -534,7 +572,6 @@ export default {
methods: { methods: {
/** 查询安检任务执行列表 */ /** 查询安检任务执行列表 */
getList() { getList() {
console.log(this.queryParams);
this.loading = true; this.loading = true;
jmlist(this.queryParams).then((response) => { jmlist(this.queryParams).then((response) => {
this.inspectList = response.rows; this.inspectList = response.rows;
...@@ -752,6 +789,15 @@ export default { ...@@ -752,6 +789,15 @@ export default {
} }
}) })
}, },
//任务进度查询
queryItem(param,value){
this.resetForm("queryForm");
this.inspectTimeRange = [];
this.queryParams.beginDate = null;
this.queryParams.endDate = null;
this.queryParams[param] = value;
this.handleQuery();
}
}, },
}; };
</script> </script>
...@@ -822,6 +868,7 @@ export default { ...@@ -822,6 +868,7 @@ export default {
} }
.b { .b {
.bottom-item { .bottom-item {
cursor: pointer;
.imgbg { .imgbg {
width: 80px; width: 80px;
height: 56px; height: 56px;
...@@ -874,5 +921,9 @@ export default { ...@@ -874,5 +921,9 @@ export default {
} }
} }
} }
.top-item-open{
width: 826px !important;
}
} }
</style> </style>
huaxin-web/src/views/checktask/task/IndustryDetail.vue
View file @ 50cd2370
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
返回 返回
</el-button> </el-button>
<div class="top flex-b"> <div class="top flex-b">
<div class="l top-item bb"> <div class="l top-item bb" :class="{ 'top-item-open': !dangerShow }">
<div class="t">{{ taskDetailData.title }}</div> <div class="t">{{ taskDetailData.title }}</div>
<div class="m bb"> <div class="m bb">
<span class="sl">任务起止时间</span> <span class="sl">任务起止时间</span>
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="m top-item bb"> <div class="m top-item bb" :class="{ 'top-item-open': !dangerShow }">
<div class="t">任务进度</div> <div class="t">任务进度</div>
<div class="b flex-b bb"> <div class="b flex-b bb">
<div v-for="item in itemDataA" :key="item.label" class="bottom-item"> <div v-for="item in itemDataA" :key="item.label" class="bottom-item" @click="queryItem(item.inspectStatus)">
<div <div
:style="{ :style="{
background: `url(${item.src}) no-repeat center`, background: `url(${item.src}) no-repeat center`,
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="r top-item bb"> <div class="r top-item bb" v-show="dangerShow">
<div class="t">隐患信息</div> <div class="t">隐患信息</div>
<div class="flex-b m bb"> <div class="flex-b m bb">
<div>存在隐患</div> <div>存在隐患</div>
...@@ -137,6 +137,15 @@ ...@@ -137,6 +137,15 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
<el-button
icon="el-icon-document"
size="mini"
type="info"
@click="dangerShow=!dangerShow"
>
隐患信息
</el-button>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
...@@ -292,36 +301,42 @@ export default { ...@@ -292,36 +301,42 @@ export default {
val: 2109, val: 2109,
src: imgA, src: imgA,
color: "#2167E5", color: "#2167E5",
inspectStatus: "-1"
}, },
{ {
label: "到访不遇", label: "到访不遇",
val: 21, val: 21,
src: imgA, src: imgA,
color: "#2167E5", color: "#2167E5",
inspectStatus: "0"
}, },
{ {
label: "拒绝安检", label: "拒绝安检",
val: 3, val: 3,
src: imgB, src: imgB,
color: "#E22121", color: "#E22121",
inspectStatus: "1"
}, },
{ {
label: "燃气停用", label: "燃气停用",
val: 4, val: 4,
src: imgA, src: imgA,
color: "#2167E5", color: "#2167E5",
inspectStatus: "3"
}, },
{ {
label: "已安检", label: "已安检",
val: 1209, val: 1209,
src: imgC, src: imgC,
color: "#08932D", color: "#08932D",
inspectStatus: "2"
}, },
], ],
industryDetailInfo: [], industryDetailInfo: [],
statusOptions: [], statusOptions: [],
taskDetailData:{}, taskDetailData:{},
taskInspectDangerDetailData:{} taskInspectDangerDetailData:{},
dangerShow:false
}; };
}, },
created() { created() {
...@@ -424,6 +439,12 @@ export default { ...@@ -424,6 +439,12 @@ export default {
} }
}) })
}, },
//任务进度查询
queryItem(inspectStatus){
this.resetForm("queryForm");
this.queryParams.inspectStatus = inspectStatus;
this.handleQuery();
}
}, },
}; };
</script> </script>
...@@ -495,6 +516,7 @@ export default { ...@@ -495,6 +516,7 @@ export default {
} }
.b { .b {
.bottom-item { .bottom-item {
cursor: pointer;
.imgbg { .imgbg {
width: 80px; width: 80px;
height: 56px; height: 56px;
...@@ -547,5 +569,9 @@ export default { ...@@ -547,5 +569,9 @@ export default {
} }
} }
} }
.top-item-open{
width: 826px !important;
}
} }
</style> </style>
huaxin-web/src/views/checktask/task/cyindex.vue
View file @ 50cd2370
...@@ -25,6 +25,19 @@ ...@@ -25,6 +25,19 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="任务状态" prop="status">
<el-select
v-model="queryParams.status"
clearable
size="small"
palceholder="请选择任务状态"
@keyup.enter.native="handleQuery"
>
<el-option label="进行中" value="0" />
<el-option label="已结束" value="1" />
</el-select>
</el-form-item>
<!--<el-form-item label="用户类型，1是居民，2是工商户，3是工业" prop="type">--> <!--<el-form-item label="用户类型，1是居民，2是工商户，3是工业" prop="type">-->
<!--<el-select v-model="queryParams.type" placeholder="请选择用户类型，1是居民，2是工商户，3是工业" clearable size="small">--> <!--<el-select v-model="queryParams.type" placeholder="请选择用户类型，1是居民，2是工商户，3是工业" clearable size="small">-->
<!--<el-option label="请选择字典生成" value="" />--> <!--<el-option label="请选择字典生成" value="" />-->
...@@ -387,7 +400,7 @@ export default { ...@@ -387,7 +400,7 @@ export default {
pageSize: 4, pageSize: 4,
title: null, title: null,
type: 2, type: 2,
status: null, status: '0',
}, },
// 表单参数 // 表单参数
form: {}, form: {},
......
huaxin-web/src/views/checktask/task/gyindex.vue
View file @ 50cd2370
...@@ -25,6 +25,19 @@ ...@@ -25,6 +25,19 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="任务状态" prop="status">
<el-select
v-model="queryParams.status"
clearable
size="small"
palceholder="请选择任务状态"
@keyup.enter.native="handleQuery"
>
<el-option label="进行中" value="0" />
<el-option label="已结束" value="1" />
</el-select>
</el-form-item>
<!--<el-form-item label="用户类型，1是居民，2是工商户，3是工业" prop="type">--> <!--<el-form-item label="用户类型，1是居民，2是工商户，3是工业" prop="type">-->
<!--<el-select v-model="queryParams.type" placeholder="请选择用户类型，1是居民，2是工商户，3是工业" clearable size="small">--> <!--<el-select v-model="queryParams.type" placeholder="请选择用户类型，1是居民，2是工商户，3是工业" clearable size="small">-->
<!--<el-option label="请选择字典生成" value="" />--> <!--<el-option label="请选择字典生成" value="" />-->
...@@ -404,7 +417,7 @@ export default { ...@@ -404,7 +417,7 @@ export default {
pageSize: 10, pageSize: 10,
title: null, title: null,
type: 3, type: 3,
status: null, status: '0',
year: null, year: null,
}, },
// 表单参数 // 表单参数
......
huaxin-web/src/views/checktask/task/index.vue
View file @ 50cd2370
...@@ -27,6 +27,19 @@ ...@@ -27,6 +27,19 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="任务状态" prop="status">
<el-select
v-model="queryParams.status"
clearable
size="small"
palceholder="请选择任务状态"
@keyup.enter.native="handleQuery"
>
<el-option label="进行中" value="0" />
<el-option label="已结束" value="1" />
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
...@@ -471,7 +484,7 @@ export default { ...@@ -471,7 +484,7 @@ export default {
title: null, title: null,
year: null, year: null,
type: 1, type: 1,
status: null, status: '0',
}, },
taskId: "", taskId: "",
oldcommunity: [], oldcommunity: [],
......
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