Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zh-baseversion-project
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王浩
zh-baseversion-project
Commits
d435ca23
Commit
d435ca23
authored
Jul 04, 2024
by
耿迪迪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
监督检查检查任务修改
parent
492c21fb
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
598 additions
and
122 deletions
+598
-122
GovernmentSupervisionInfoController.java
...oller/government/GovernmentSupervisionInfoController.java
+1
-0
SecurityConfig.java
...main/java/com/zehong/framework/config/SecurityConfig.java
+3
-3
TInsInsListInforMapper.xml
...c/main/resources/mapper/system/TInsInsListInforMapper.xml
+1
-0
TInsScopeInforMapper.xml
...src/main/resources/mapper/system/TInsScopeInforMapper.xml
+1
-0
TInsSurListInforMapper.xml
...c/main/resources/mapper/system/TInsSurListInforMapper.xml
+1
-0
GovermentData.js
zh-baseversion-web/src/api/govermentdata/GovermentData.js
+10
-0
DetailInfo.vue
...b/src/views/supervision/inspect/components/DetailInfo.vue
+1
-1
index.vue
zh-baseversion-web/src/views/supervision/inspect/index.vue
+24
-8
DetailInfo.vue
...-web/src/views/supervision/task/components/DetailInfo.vue
+19
-109
Inspect.vue
...ion-web/src/views/supervision/task/components/Inspect.vue
+128
-0
Scope.vue
...rsion-web/src/views/supervision/task/components/Scope.vue
+137
-0
Survey.vue
...sion-web/src/views/supervision/task/components/Survey.vue
+118
-0
TaskInfo.vue
...on-web/src/views/supervision/task/components/TaskInfo.vue
+130
-0
index.vue
zh-baseversion-web/src/views/supervision/task/index.vue
+24
-1
No files found.
zh-baseversion-admin/src/main/java/com/zehong/web/controller/government/GovernmentSupervisionInfoController.java
View file @
d435ca23
...
@@ -178,6 +178,7 @@ public class GovernmentSupervisionInfoController {
...
@@ -178,6 +178,7 @@ public class GovernmentSupervisionInfoController {
map
.
put
(
"pageIndex"
,
pageIndex
);
map
.
put
(
"pageIndex"
,
pageIndex
);
map
.
put
(
"pageSize"
,
pageSize
);
map
.
put
(
"pageSize"
,
pageSize
);
JSONObject
json
=
governmentSupervisionInfoService
.
getTask
(
map
);
JSONObject
json
=
governmentSupervisionInfoService
.
getTask
(
map
);
if
(
null
==
json
||
!
"0"
.
equals
(
json
.
getString
(
"resultCode"
)))
return
null
==
json
?
AjaxResult
.
error
(
"获取检查任务失败"
)
:
AjaxResult
.
error
(
json
.
getString
(
"resultMessage"
));
return
AjaxResult
.
success
(
json
);
return
AjaxResult
.
success
(
json
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"获取检查任务失败"
,
e
);
log
.
error
(
"获取检查任务失败"
,
e
);
...
...
zh-baseversion-framework/src/main/java/com/zehong/framework/config/SecurityConfig.java
View file @
d435ca23
...
@@ -105,15 +105,15 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
...
@@ -105,15 +105,15 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
"/websocketServer"
,
"/websocketServer"
,
"/detector/detectorReport/**"
,
"/detector/detectorReport/**"
,
"/getout/**"
,
"/getout/**"
,
"/token/**"
,
"/token/**"
"/government/supervision/**"
).
anonymous
()
).
anonymous
()
.
antMatchers
(
.
antMatchers
(
HttpMethod
.
GET
,
HttpMethod
.
GET
,
"/*.html"
,
"/*.html"
,
"/**/*.html"
,
"/**/*.html"
,
"/**/*.css"
,
"/**/*.css"
,
"/**/*.js"
"/**/*.js"
,
"/government/supervision/**"
).
permitAll
()
).
permitAll
()
.
antMatchers
(
"/addSave"
).
anonymous
()
.
antMatchers
(
"/addSave"
).
anonymous
()
.
antMatchers
(
"/profile/**"
).
anonymous
()
.
antMatchers
(
"/profile/**"
).
anonymous
()
...
...
zh-baseversion-system/src/main/resources/mapper/system/TInsInsListInforMapper.xml
View file @
d435ca23
...
@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include
refid=
"selectTInsInsListInforVo"
/>
<include
refid=
"selectTInsInsListInforVo"
/>
<where>
<where>
<if
test=
"fCheckTimeName != null and fCheckTimeName != ''"
>
and inspect.f_check_time_name like concat('%', #{fCheckTimeName}, '%')
</if>
<if
test=
"fCheckTimeName != null and fCheckTimeName != ''"
>
and inspect.f_check_time_name like concat('%', #{fCheckTimeName}, '%')
</if>
<if
test=
"fCheckTaskCode != null and fCheckTaskCode != ''"
>
and inspect.f_check_task_code = #{fCheckTaskCode}
</if>
</where>
</where>
ORDER BY inspect.f_create_time DESC
ORDER BY inspect.f_create_time DESC
</select>
</select>
...
...
zh-baseversion-system/src/main/resources/mapper/system/TInsScopeInforMapper.xml
View file @
d435ca23
...
@@ -51,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -51,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"fName != null and fName != ''"
>
and task.f_name like concat('%', #{fName}, '%')
</if>
<if
test=
"fName != null and fName != ''"
>
and task.f_name like concat('%', #{fName}, '%')
</if>
<if
test=
"fObjectType != null and fObjectType != ''"
>
and scope.f_object_type = #{fObjectType}
</if>
<if
test=
"fObjectType != null and fObjectType != ''"
>
and scope.f_object_type = #{fObjectType}
</if>
<if
test=
"fSpotCheckType != null and fSpotCheckType != ''"
>
and scope.f_spot_check_type = #{fSpotCheckType}
</if>
<if
test=
"fSpotCheckType != null and fSpotCheckType != ''"
>
and scope.f_spot_check_type = #{fSpotCheckType}
</if>
<if
test=
"fHazardCheckTaskId != null"
>
and scope.f_hazard_check_task_id = #{fHazardCheckTaskId}
</if>
</where>
</where>
ORDER BY scope.f_create_time DESC
ORDER BY scope.f_create_time DESC
</select>
</select>
...
...
zh-baseversion-system/src/main/resources/mapper/system/TInsSurListInforMapper.xml
View file @
d435ca23
...
@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<where>
<if
test=
"fTypeCode != null and fTypeCode != ''"
>
and f_type_code = #{fTypeCode}
</if>
<if
test=
"fTypeCode != null and fTypeCode != ''"
>
and f_type_code = #{fTypeCode}
</if>
<if
test=
"fResType != null "
>
and f_res_type = #{fResType}
</if>
<if
test=
"fResType != null "
>
and f_res_type = #{fResType}
</if>
<if
test=
"fCheckTaskCode != null and fCheckTaskCode != ''"
>
and f_check_task_code = #{fCheckTaskCode}
</if>
</where>
</where>
ORDER BY f_last_update_time DESC
ORDER BY f_last_update_time DESC
</select>
</select>
...
...
zh-baseversion-web/src/api/govermentdata/GovermentData.js
0 → 100644
View file @
d435ca23
import
request
from
'@/utils/request'
;
//获取任务
export
function
getTask
(
query
)
{
return
request
({
url
:
'/government/supervision/getTask'
,
method
:
'get'
,
params
:
query
})
}
zh-baseversion-web/src/views/supervision/inspect/components/DetailInfo.vue
View file @
d435ca23
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"检查对象分类"
>
<el-form-item
label=
"检查对象分类"
>
<span
v-if=
"detailInfo.fCheckClassification"
>
{{
detailInfo
.
fCheckClassification
}}
</span>
<span
v-if=
"detailInfo.fCheckClassification"
>
{{
$parent
.
fTypeCodeFormat
(
detailInfo
)
}}
</span>
<span
v-else
>
-
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
...
zh-baseversion-web/src/views/supervision/inspect/index.vue
View file @
d435ca23
...
@@ -64,12 +64,7 @@
...
@@ -64,12 +64,7 @@
<el-table-column
label=
"检查项任务编码"
align=
"center"
prop=
"fCheckTaskCode"
/>
<el-table-column
label=
"检查项任务编码"
align=
"center"
prop=
"fCheckTaskCode"
/>
<el-table-column
label=
"检查项唯一编码"
align=
"center"
prop=
"fUniqueCode"
/>
<el-table-column
label=
"检查项唯一编码"
align=
"center"
prop=
"fUniqueCode"
/>
<el-table-column
label=
"检查项名称"
align=
"center"
prop=
"fCheckTimeName"
/>
<el-table-column
label=
"检查项名称"
align=
"center"
prop=
"fCheckTimeName"
/>
<el-table-column
label=
"检查对象分类"
align=
"center"
prop=
"fCheckClassification"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"检查对象分类"
align=
"center"
prop=
"fCheckClassification"
:formatter=
"fTypeCodeFormat"
:show-overflow-tooltip=
"true"
/>
<template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.fCheckClassification"
>
{{
scope
.
row
.
fCheckClassification
}}
</span>
<span
v-else
>
-
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"检查方法"
align=
"center"
prop=
"fCheckMethod"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"检查方法"
align=
"center"
prop=
"fCheckMethod"
:show-overflow-tooltip=
"true"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.fCheckMethod"
>
{{
scope
.
row
.
fCheckMethod
}}
</span>
<span
v-if=
"scope.row.fCheckMethod"
>
{{
scope
.
row
.
fCheckMethod
}}
</span>
...
@@ -163,7 +158,18 @@
...
@@ -163,7 +158,18 @@
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"检查对象分类"
prop=
"fCheckClassification"
>
<el-form-item
label=
"检查对象分类"
prop=
"fCheckClassification"
>
<el-input
v-model=
"form.fCheckClassification"
placeholder=
"请输入检查对象分类"
/>
<el-select
v-model=
"form.fCheckClassification"
placeholder=
"请选择检查对象分类"
style=
"width: 100%"
>
<el-option
v-for=
"dict in fTypeCodeOptions"
:key=
"dict.dictValue"
:label=
"dict.dictLabel"
:value=
"dict.dictValue"
></el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -315,7 +321,9 @@ export default {
...
@@ -315,7 +321,9 @@ export default {
],
],
},
},
taskData
:
[],
taskData
:
[],
hiddenData
:
[]
hiddenData
:
[],
// 检查对象分类
fTypeCodeOptions
:
[],
};
};
},
},
created
()
{
created
()
{
...
@@ -326,6 +334,9 @@ export default {
...
@@ -326,6 +334,9 @@ export default {
this
.
getDicts
(
"t_delete_flag"
).
then
(
response
=>
{
this
.
getDicts
(
"t_delete_flag"
).
then
(
response
=>
{
this
.
fDeleteFlagOptions
=
response
.
data
;
this
.
fDeleteFlagOptions
=
response
.
data
;
});
});
this
.
getDicts
(
"t_type_code"
).
then
(
response
=>
{
this
.
fTypeCodeOptions
=
response
.
data
;
});
},
},
methods
:
{
methods
:
{
/** 查询检查项列表 */
/** 查询检查项列表 */
...
@@ -345,6 +356,11 @@ export default {
...
@@ -345,6 +356,11 @@ export default {
fDeleteFlagFormat
(
row
,
column
)
{
fDeleteFlagFormat
(
row
,
column
)
{
return
this
.
selectDictLabel
(
this
.
fDeleteFlagOptions
,
row
.
fDeleteFlag
);
return
this
.
selectDictLabel
(
this
.
fDeleteFlagOptions
,
row
.
fDeleteFlag
);
},
},
// 检查对象分类
fTypeCodeFormat
(
row
,
column
)
{
const
type
=
this
.
selectDictLabel
(
this
.
fTypeCodeOptions
,
row
.
fCheckClassification
);
return
type
?
type
:
"-"
;
},
// 取消按钮
// 取消按钮
cancel
()
{
cancel
()
{
this
.
open
=
false
;
this
.
open
=
false
;
...
...
zh-baseversion-web/src/views/supervision/task/components/DetailInfo.vue
View file @
d435ca23
<
template
>
<
template
>
<el-dialog
title=
"详情"
:visible
.
sync=
"detailOpen"
width=
"1000px"
append-to-body
destroy-on-close
:close-on-click-modal=
"false"
>
<el-dialog
title=
"详情"
:visible
.
sync=
"detailOpen"
width=
"1200px"
append-to-body
destroy-on-close
:close-on-click-modal=
"false"
>
<!-- 任务详情 -->
<TaskInfo
:detailInfo=
"detailInfo"
/>
<el-form
label-width=
"110px"
>
<!-- 检查范围 -->
<el-row
class=
"el-row-table"
>
<Scope
v-if=
"detailOpen"
:fHazardCheckTaskId=
"detailInfo.fInsTaskInforId"
/>
<el-col
:span=
"12"
>
<el-form-item
label=
"任务名称"
>
<span
v-if=
"detailInfo.fName"
>
{{
detailInfo
.
fName
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<!-- 检查项 -->
<el-form-item
label=
"任务唯一编码"
>
<Inspect
v-if=
"detailOpen"
:fCheckTaskCode=
"detailInfo.fUniqueCode"
/>
<span
v-if=
"detailInfo.fUniqueCode"
>
{{
detailInfo
.
fUniqueCode
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<!-- 调查项 -->
<el-form-item
label=
"任务归属"
>
<Survey
v-if=
"detailOpen"
:fCheckTaskCode=
"detailInfo.fUniqueCode"
/>
<span
v-if=
"detailInfo.fTaskBelong"
>
{{
detailInfo
.
fTaskBelong
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"任务类型"
>
<span
v-if=
"detailInfo.fTaskType"
>
{{
$parent
.
fTaskTypeFormat
(
detailInfo
)
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"是否下发"
>
<span
v-if=
"detailInfo.fDistributeFlag"
>
{{
$parent
.
fDistributeFlagFormat
(
detailInfo
)
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"24"
>
<el-form-item
label=
"任务说明"
>
<span
v-if=
"detailInfo.fDesc"
>
{{
detailInfo
.
fDesc
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"任务开始时间"
>
<span
v-if=
"detailInfo.fStartTime"
>
{{
detailInfo
.
fStartTime
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"任务截至时间"
>
<span
v-if=
"detailInfo.fEndTime"
>
{{
detailInfo
.
fEndTime
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"任务状态"
>
<span
v-if=
"detailInfo.fStatus"
>
{{
$parent
.
fStatusFormat
(
detailInfo
)
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"删除标记"
>
<span
v-if=
"detailInfo.fDeleteFlag.toString()"
>
{{
$parent
.
fDeleteFlagFormat
(
detailInfo
)
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"24"
>
<el-form-item
label=
"描述"
>
<span
v-if=
"detailInfo.fRemark"
>
{{
detailInfo
.
fRemark
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"创建时间"
>
<span
v-if=
"detailInfo.fCreateTime"
>
{{
detailInfo
.
fCreateTime
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"创建人"
>
<span
v-if=
"detailInfo.fCreateBy"
>
{{
detailInfo
.
fCreateBy
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"修改时间"
>
<span
v-if=
"detailInfo.fUpdateTime"
>
{{
detailInfo
.
fUpdateTime
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"修改人"
>
<span
v-if=
"detailInfo.fModifyBy"
>
{{
detailInfo
.
fModifyBy
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</el-dialog>
...
@@ -118,8 +18,18 @@
...
@@ -118,8 +18,18 @@
<
script
>
<
script
>
import
{
getInfor
}
from
"@/api/supervision/task"
;
import
{
getInfor
}
from
"@/api/supervision/task"
;
import
TaskInfo
from
"./TaskInfo"
;
import
Scope
from
"./Scope"
;
import
Inspect
from
"./Inspect"
;
import
Survey
from
"./Survey"
;
export
default
{
export
default
{
name
:
"detail-info"
,
name
:
"detail-info"
,
components
:{
TaskInfo
,
Scope
,
Inspect
,
Survey
},
data
(){
data
(){
return
{
return
{
detailInfo
:
{
detailInfo
:
{
...
...
zh-baseversion-web/src/views/supervision/task/components/Inspect.vue
0 → 100644
View file @
d435ca23
<
template
>
<div>
<h3>
检查项
</h3>
<el-table
v-loading=
"loading"
:data=
"inforList"
>
<el-table-column
label=
"检查项任务编码"
align=
"center"
prop=
"fCheckTaskCode"
/>
<el-table-column
label=
"检查项唯一编码"
align=
"center"
prop=
"fUniqueCode"
/>
<el-table-column
label=
"检查项名称"
align=
"center"
prop=
"fCheckTimeName"
/>
<el-table-column
label=
"检查对象分类"
align=
"center"
prop=
"fCheckClassification"
:show-overflow-tooltip=
"true"
>
<template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.fCheckClassification"
>
{{
scope
.
row
.
fCheckClassification
}}
</span>
<span
v-else
>
-
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"隐患级别"
align=
"center"
prop=
"fHazardLevel"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.fHazardLevel"
>
{{
scope
.
row
.
fHazardLevel
}}
</span>
<span
v-else
>
-
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"启用状态"
align=
"center"
prop=
"fEnableState"
:formatter=
"fEnableStateFormat"
/>
<el-table-column
label=
"检查依据"
align=
"center"
prop=
"fCheckBasis"
:show-overflow-tooltip=
"true"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.fCheckBasis"
>
{{
scope
.
row
.
fCheckBasis
}}
</span>
<span
v-else
>
-
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"隐患分类分级标准"
align=
"center"
prop=
"hazardName"
width=
"150"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
width=
"150"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-document"
@
click=
"handleDetail(scope.row)"
>
详情
</el-button>
</
template
>
</el-table-column>
</el-table>
<pagination
v-show=
"total>0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
:pageSizes=
"[5,10, 20, 30, 50]"
@
pagination=
"getList"
/>
<!-- 详情 -->
<DetailInfo
ref=
"detail"
/>
</div>
</template>
<
script
>
import
{
listInfor
}
from
"@/api/supervision/inspect"
;
import
DetailInfo
from
"../../inspect/components/DetailInfo"
;
export
default
{
name
:
"inspect"
,
props
:{
fCheckTaskCode
:{
type
:
String
}
},
components
:{
DetailInfo
},
data
(){
return
{
loading
:
false
,
total
:
0
,
inforList
:
[],
queryParams
:
{
pageNum
:
1
,
pageSize
:
5
,
},
// 启用状态,0-启用,1-禁用字典
fEnableStateOptions
:
[],
// 删除标记,0-可用,1-已删除字典
fDeleteFlagOptions
:
[],
fTypeCodeOptions
:
[]
}
},
created
()
{
this
.
queryParams
.
fCheckTaskCode
=
this
.
fCheckTaskCode
;
this
.
getList
();
this
.
getDicts
(
"t_enable_state"
).
then
(
response
=>
{
this
.
fEnableStateOptions
=
response
.
data
;
});
this
.
getDicts
(
"t_delete_flag"
).
then
(
response
=>
{
this
.
fDeleteFlagOptions
=
response
.
data
;
});
this
.
getDicts
(
"t_type_code"
).
then
(
response
=>
{
this
.
fTypeCodeOptions
=
response
.
data
;
});
},
methods
:{
getList
()
{
this
.
loading
=
true
;
listInfor
(
this
.
queryParams
).
then
(
response
=>
{
this
.
inforList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
});
},
// 启用状态,0-启用,1-禁用字典翻译
fEnableStateFormat
(
row
,
column
)
{
return
this
.
selectDictLabel
(
this
.
fEnableStateOptions
,
row
.
fEnableState
);
},
// 删除标记,0-可用,1-已删除字典翻译
fDeleteFlagFormat
(
row
,
column
)
{
return
this
.
selectDictLabel
(
this
.
fDeleteFlagOptions
,
row
.
fDeleteFlag
);
},
// 检查对象分类
fTypeCodeFormat
(
row
,
column
)
{
const
type
=
this
.
selectDictLabel
(
this
.
fTypeCodeOptions
,
row
.
fCheckClassification
);
return
type
?
type
:
"-"
;
},
//详情
handleDetail
(
row
){
this
.
$refs
.
detail
.
getDetailInfo
(
row
.
fInsInsListInforId
);
},
}
}
</
script
>
<
style
scoped
>
</
style
>
zh-baseversion-web/src/views/supervision/task/components/Scope.vue
0 → 100644
View file @
d435ca23
<
template
>
<div>
<h3>
检查范围
</h3>
<el-table
v-loading=
"loading"
:data=
"inforList"
>
<el-table-column
label=
"任务名称"
align=
"center"
prop=
"fName"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"对象分类"
align=
"center"
prop=
"fObjectType"
:formatter=
"fObjectTypeFormat"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"抽查要求"
align=
"center"
prop=
"fSpotCheckType"
>
<template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.fSpotCheckType"
>
{{
fSpotCheckTypeFormat
(
scope
.
row
)
}}
</span>
<span
v-else
>
-
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"城区标识"
align=
"center"
prop=
"fSpecialFlag"
:formatter=
"fSpecialFlagFormat"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.fSpecialFlag"
>
{{
fSpecialFlagFormat
(
scope
.
row
)
}}
</span>
<span
v-else
>
-
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"此对象应检数据"
align=
"center"
prop=
"fLotCount"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.fLotCount"
>
{{
scope
.
row
.
fLotCount
}}
</span>
<span
v-else
>
-
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"fCreateTime"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"创建人"
align=
"center"
prop=
"fCreateBy"
/>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-document"
@
click=
"handleDetail(scope.row)"
>
详情
</el-button>
</
template
>
</el-table-column>
</el-table>
<pagination
v-show=
"total>0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
:pageSizes=
"[5,10, 20, 30, 50]"
@
pagination=
"getList"
/>
<!-- 详情 -->
<DetailInfo
ref=
"detail"
/>
</div>
</template>
<
script
>
import
{
listInfor
}
from
"@/api/supervision/scope"
;
import
DetailInfo
from
"../../scope/components/DetailInfo"
;
export
default
{
name
:
"scope"
,
props
:{
fHazardCheckTaskId
:{
type
:
Number
}
},
components
:{
DetailInfo
},
data
(){
return
{
loading
:
false
,
total
:
0
,
// 查询参数
queryParams
:
{
pageNum
:
1
,
pageSize
:
5
,
},
inforList
:
[],
// 对象分类
fObjectTypeOptions
:
[],
// 抽查要求 1:抽查;0-全覆盖字典
fSpotCheckTypeOptions
:
[],
// T-主城区(默认),F-三市字典
fSpecialFlagOptions
:
[],
// 删除标记,0-可用,1-已删除字典
fDeleteFlagOptions
:
[],
}
},
created
()
{
this
.
queryParams
.
fHazardCheckTaskId
=
this
.
fHazardCheckTaskId
;
this
.
getList
();
this
.
getDicts
(
"t_object_type"
).
then
(
response
=>
{
this
.
fObjectTypeOptions
=
response
.
data
;
});
this
.
getDicts
(
"t_spot_check_type"
).
then
(
response
=>
{
this
.
fSpotCheckTypeOptions
=
response
.
data
;
});
this
.
getDicts
(
"t_special_flag"
).
then
(
response
=>
{
this
.
fSpecialFlagOptions
=
response
.
data
;
});
this
.
getDicts
(
"t_delete_flag"
).
then
(
response
=>
{
this
.
fDeleteFlagOptions
=
response
.
data
;
});
},
methods
:{
getList
()
{
this
.
loading
=
true
;
listInfor
(
this
.
queryParams
).
then
(
response
=>
{
this
.
inforList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
});
},
// 对象分类
fObjectTypeFormat
(
row
,
column
)
{
return
this
.
selectDictLabel
(
this
.
fObjectTypeOptions
,
row
.
fObjectType
);
},
// 抽查要求 1:抽查;0-全覆盖字典翻译
fSpotCheckTypeFormat
(
row
,
column
)
{
return
this
.
selectDictLabel
(
this
.
fSpotCheckTypeOptions
,
row
.
fSpotCheckType
);
},
// T-主城区(默认),F-三市字典翻译
fSpecialFlagFormat
(
row
,
column
)
{
return
this
.
selectDictLabel
(
this
.
fSpecialFlagOptions
,
row
.
fSpecialFlag
);
},
// 删除标记,0-可用,1-已删除字典翻译
fDeleteFlagFormat
(
row
,
column
)
{
return
this
.
selectDictLabel
(
this
.
fDeleteFlagOptions
,
row
.
fDeleteFlag
);
},
//详情
handleDetail
(
row
){
this
.
$refs
.
detail
.
getDetailInfo
(
row
.
fScopeInforId
);
},
}
}
</
script
>
<
style
scoped
>
</
style
>
zh-baseversion-web/src/views/supervision/task/components/Survey.vue
0 → 100644
View file @
d435ca23
<
template
>
<div>
<h3>
调查项
</h3>
<el-table
v-loading=
"loading"
:data=
"inforList"
>
<el-table-column
label=
"检查任务编码"
align=
"center"
prop=
"fCheckTaskCode"
/>
<el-table-column
label=
"检查对象分类"
align=
"center"
prop=
"fTypeCode"
:formatter=
"fTypeCodeFormat"
/>
<el-table-column
label=
"调查内容"
align=
"center"
prop=
"fContents"
>
<template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.fContents"
>
{{
scope
.
row
.
fContents
}}
</span>
<span
v-else
>
-
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"结果填写类型"
align=
"center"
prop=
"fResType"
:formatter=
"fResTypeFormat"
/>
<el-table-column
label=
"结果填写选项"
align=
"center"
prop=
"fResOption"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.fResOption"
>
{{
scope
.
row
.
fResOption
}}
</span>
<span
v-else
>
-
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"顺序号"
align=
"center"
prop=
"ord"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.ord"
>
{{
scope
.
row
.
ord
}}
</span>
<span
v-else
>
-
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"最后修改时间"
align=
"center"
prop=
"fLastUpdateTime"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-document"
@
click=
"handleDetail(scope.row)"
>
详情
</el-button>
</
template
>
</el-table-column>
</el-table>
<pagination
v-show=
"total>0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
:pageSizes=
"[5,10, 20, 30, 50]"
@
pagination=
"getList"
/>
<!-- 详情 -->
<DetailInfo
ref=
"detail"
/>
</div>
</template>
<
script
>
import
{
listInfor
}
from
"@/api/supervision/survey"
;
import
DetailInfo
from
"../../survey/components/DetailInfo"
;
export
default
{
name
:
"survey"
,
props
:{
fCheckTaskCode
:{
type
:
String
}
},
components
:{
DetailInfo
},
data
(){
return
{
loading
:
false
,
total
:
0
,
queryParams
:
{
pageNum
:
1
,
pageSize
:
5
,
},
inforList
:[],
// 检查对象分类
fTypeCodeOptions
:
[],
// 结果填写类型
fResTypeOptions
:
[],
}
},
created
()
{
this
.
queryParams
.
fCheckTaskCode
=
this
.
fCheckTaskCode
;
this
.
getList
();
this
.
getDicts
(
"t_type_code"
).
then
(
response
=>
{
this
.
fTypeCodeOptions
=
response
.
data
;
});
this
.
getDicts
(
"f_res_type"
).
then
(
response
=>
{
this
.
fResTypeOptions
=
response
.
data
;
});
},
methods
:{
getList
()
{
this
.
loading
=
true
;
listInfor
(
this
.
queryParams
).
then
(
response
=>
{
this
.
inforList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
});
},
// 检查对象分类
fTypeCodeFormat
(
row
,
column
)
{
return
this
.
selectDictLabel
(
this
.
fTypeCodeOptions
,
row
.
fTypeCode
);
},
// 结果填写类型,1单选、2-多选、3 输入字典翻译
fResTypeFormat
(
row
,
column
)
{
return
this
.
selectDictLabel
(
this
.
fResTypeOptions
,
row
.
fResType
);
},
//详情
handleDetail
(
row
){
this
.
$refs
.
detail
.
getDetailInfo
(
row
.
fInsSurListInforId
);
},
}
}
</
script
>
<
style
scoped
>
</
style
>
zh-baseversion-web/src/views/supervision/task/components/TaskInfo.vue
0 → 100644
View file @
d435ca23
<
template
>
<div>
<h3>
任务详情
</h3>
<el-form
label-width=
"110px"
>
<el-row
class=
"el-row-table"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"任务名称"
>
<span
v-if=
"detailInfo.fName"
>
{{
detailInfo
.
fName
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"任务唯一编码"
>
<span
v-if=
"detailInfo.fUniqueCode"
>
{{
detailInfo
.
fUniqueCode
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"任务归属"
>
<span
v-if=
"detailInfo.fTaskBelong"
>
{{
detailInfo
.
fTaskBelong
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"任务类型"
>
<span
v-if=
"detailInfo.fTaskType"
>
{{
$parent
.
$parent
.
$parent
.
fTaskTypeFormat
(
detailInfo
)
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"是否下发"
>
<span
v-if=
"detailInfo.fDistributeFlag"
>
{{
$parent
.
$parent
.
$parent
.
fDistributeFlagFormat
(
detailInfo
)
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"24"
>
<el-form-item
label=
"任务说明"
>
<span
v-if=
"detailInfo.fDesc"
>
{{
detailInfo
.
fDesc
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"任务开始时间"
>
<span
v-if=
"detailInfo.fStartTime"
>
{{
detailInfo
.
fStartTime
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"任务截至时间"
>
<span
v-if=
"detailInfo.fEndTime"
>
{{
detailInfo
.
fEndTime
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"任务状态"
>
<span
v-if=
"detailInfo.fStatus"
>
{{
$parent
.
$parent
.
$parent
.
fStatusFormat
(
detailInfo
)
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"删除标记"
>
<span
v-if=
"detailInfo.fDeleteFlag.toString()"
>
{{
$parent
.
$parent
.
$parent
.
fDeleteFlagFormat
(
detailInfo
)
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"24"
>
<el-form-item
label=
"描述"
>
<span
v-if=
"detailInfo.fRemark"
>
{{
detailInfo
.
fRemark
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"创建时间"
>
<span
v-if=
"detailInfo.fCreateTime"
>
{{
detailInfo
.
fCreateTime
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"创建人"
>
<span
v-if=
"detailInfo.fCreateBy"
>
{{
detailInfo
.
fCreateBy
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"修改时间"
>
<span
v-if=
"detailInfo.fUpdateTime"
>
{{
detailInfo
.
fUpdateTime
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"修改人"
>
<span
v-if=
"detailInfo.fModifyBy"
>
{{
detailInfo
.
fModifyBy
}}
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</
template
>
<
script
>
export
default
{
name
:
"task-info"
,
props
:{
detailInfo
:{
type
:
Object
}
}
}
</
script
>
<
style
scoped
>
</
style
>
zh-baseversion-web/src/views/supervision/task/index.vue
View file @
d435ca23
...
@@ -102,10 +102,18 @@
...
@@ -102,10 +102,18 @@
plain
plain
icon=
"el-icon-download"
icon=
"el-icon-download"
size=
"mini"
size=
"mini"
:loading=
"exportLoading"
:loading=
"exportLoading"
@
click=
"handleExport"
@
click=
"handleExport"
>
导出
</el-button>
>
导出
</el-button>
</el-col>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
plain
size=
"mini"
type=
"info"
@
click=
"getGovermentTaskInfo"
>
从省平台获取数据
</el-button>
</el-col>
<right-toolbar
:showSearch
.
sync=
"showSearch"
@
queryTable=
"getList"
></right-toolbar>
<right-toolbar
:showSearch
.
sync=
"showSearch"
@
queryTable=
"getList"
></right-toolbar>
</el-row>
</el-row>
...
@@ -293,6 +301,8 @@
...
@@ -293,6 +301,8 @@
<
script
>
<
script
>
import
{
listInfor
,
getInfor
,
delInfor
,
addInfor
,
updateInfor
,
exportInfor
}
from
"@/api/supervision/task"
;
import
{
listInfor
,
getInfor
,
delInfor
,
addInfor
,
updateInfor
,
exportInfor
}
from
"@/api/supervision/task"
;
import
DetailInfo
from
"./components/DetailInfo"
;
import
DetailInfo
from
"./components/DetailInfo"
;
import
{
getTask
}
from
"@/api/govermentdata/GovermentData"
;
import
moment
from
"moment"
;
export
default
{
export
default
{
name
:
"Infor"
,
name
:
"Infor"
,
components
:
{
components
:
{
...
@@ -511,6 +521,19 @@ export default {
...
@@ -511,6 +521,19 @@ export default {
handleDetail
(
row
){
handleDetail
(
row
){
this
.
$refs
.
detail
.
getDetailInfo
(
row
.
fInsTaskInforId
);
this
.
$refs
.
detail
.
getDetailInfo
(
row
.
fInsTaskInforId
);
},
},
//获取数据
getGovermentTaskInfo
(){
this
.
$confirm
(
'是否确认从省平台获取数据?'
,
"警告"
,
{
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
type
:
"warning"
}).
then
(
function
()
{
return
getTask
({
updateTime
:
moment
().
format
(
'YYYY-MM-DD HH:mm:ss'
),
pageIndex
:
1
,
pageSize
:
1000
});
}).
then
(()
=>
{
this
.
getList
();
this
.
msgSuccess
(
"从省平台获取数据成功"
);
}).
catch
(()
=>
{});
}
}
}
};
};
</
script
>
</
script
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment