safecheck-client 3.0.39-8 → 3.0.39-81
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +5 -5
- package/src/App.vue +31 -26
- package/src/assets//345/256/232/344/275/215.png +0 -0
- package/src/components/Util/ImgSelfSafePlus.vue +2 -2
- package/src/components/android/AndroidDefectDeal.vue +2 -2
- package/src/components/android/NewCheckpaperAndroid.vue +2 -2
- package/src/components/android/PhoneUpUserinfo.vue +11 -0
- package/src/components/android/rejectInspecCheck.vue +322 -0
- package/src/components/pc/AddPlanItemYyChange.vue +5 -1
- package/src/components/pc/NewCheckpaper.vue +108 -14
- package/src/components/pc/NewCheckpaperTemp.vue +1308 -1295
- package/src/components/pc/PaperDefectMain.vue +1 -1
- package/src/components/pc/RoleSelector.vue +172 -172
- package/src/components/pc/SafeCheckOrder/SafeCheckOrderList.vue +34 -0
- package/src/components/rongcheng/AddPlanItem.vue +344 -344
- package/src/components/rongcheng/CheckCurrentCreate.vue +1081 -1081
- package/src/components/rongcheng/PaperDefectMain.vue +828 -828
- package/src/components/rongcheng/PaperStatem.vue +6 -6
- package/src/components/rongcheng/PhoneUpUserinfo.vue +1 -0
- package/src/filiale/BFshiye/android/AndroidDefectDeal.vue +652 -0
- package/src/filiale/BFshiye/android/PhoneUpUserinfo.vue +3 -1
- package/src/filiale/BFshiye/android/SafecheckUserInfo.vue +2 -2
- package/src/filiale/BFshiye/pc/DefectListNew.vue +637 -0
- package/src/filiale/BFshiye/pc/NewCheckpaper.vue +18 -56
- package/src/filiale/BFshiye/pc/checkUserList.vue +772 -772
- package/src/filiale/BFshiye/pc.js +17 -16
- package/src/filiale/baiyin/android/SafecheckUserInfo.vue +775 -0
- package/src/filiale/baiyin/android.js +12 -11
- package/src/filiale/bayan/pc/NewCheckpaper.vue +2 -2
- package/src/filiale/bayan/pc/SelectAreaReport.vue +1 -0
- package/src/filiale/bayan/pc/SummaryOfSecurityInspectionProgress.vue +7 -7
- package/src/filiale/dexin/android/SafecheckDevicesTemp.vue +1419 -1360
- package/src/filiale/dexin/android/SafecheckOrderV.vue +1 -1
- package/src/filiale/dexin/android/SafecheckOrderVTemp.vue +4 -1
- package/src/filiale/dexin/pc/PaperList.vue +840 -840
- package/src/filiale/hanzhong/pc/CheckHiddenDanger.vue +2 -2
- package/src/filiale/hanzhong/pc/CheckNumberStatistics.vue +1 -1
- package/src/filiale/hanzhong/pc/CheckSafeDetail.vue +6 -1
- package/src/filiale/hanzhong/pc/CheckSafeStatus.vue +1 -1
- package/src/filiale/hanzhong/pc/CheckerSafeDetail.vue +1 -1
- package/src/filiale/huatong/android/SafecheckOrderV.vue +2 -2
- package/src/filiale/jiaocheng/android/AddPlanItem.vue +20 -0
- package/src/filiale/jiaocheng/android/CurrentCreate.vue +1083 -0
- package/src/filiale/jiaocheng/android.js +1 -0
- package/src/filiale/jiaocheng/pc/CheckSearchUser.vue +18 -1
- package/src/filiale/jiaocheng/pc/NewCheckpaper.vue +64 -4
- package/src/filiale/jiaocheng/pc/PaperList.vue +803 -0
- package/src/filiale/jiaocheng/pc.js +1 -0
- package/src/filiale/jinhuang/android/AddPlanItem.vue +430 -0
- package/src/filiale/jinhuang/android/PhoneUpUserinfo.vue +183 -145
- package/src/filiale/jinhuang/android.js +2 -1
- package/src/filiale/kelai/android/PaperFeedback.vue +1553 -1550
- package/src/filiale/kelai/android/PhoneUpUserinfo.vue +1 -1
- package/src/filiale/kelai/android/SafecheckOrderV.vue +1 -1
- package/src/filiale/kelai/android/SafecheckUserInfo.vue +1 -1
- package/src/filiale/kelai/pc/PaperList.vue +13 -0
- package/src/filiale/kelai/pc/UserInfoAudit.vue +126 -90
- package/src/filiale/liaoyuan/pc/DefectPaperWeiXiu.vue +4 -6
- package/src/filiale/liaoyuan/pc/NewCheckpaper.vue +7 -7
- package/src/filiale/liaoyuan/pc/checkPlanList.vue +2 -3
- package/src/filiale/qingjian/android/PhoneUpUserinfo.vue +1357 -1270
- package/src/filiale/qingjian/android/SafecheckDevices.vue +1 -1
- package/src/filiale/qingjian/android/SafecheckOrderV.vue +3 -0
- package/src/filiale/qingjian/android/SafecheckUserInfo.vue +823 -800
- package/src/filiale/qingjian/pc/NewCheckpaper.vue +1919 -1919
- package/src/filiale/rongchuang/android/AddPlanItemVisitingWithoutMeeting.vue +454 -0
- package/src/filiale/rongchuang/android/AddPlanItemYy.vue +498 -0
- package/src/filiale/rongchuang/android/PhoneUpUserinfo.vue +1262 -0
- package/src/filiale/rongchuang/android/SafecheckDevices.vue +1 -1
- package/src/filiale/rongchuang/android/SafecheckOrderV.vue +3 -2
- package/src/filiale/rongchuang/android.js +3 -0
- package/src/filiale/rongchuang/pc/NewCheckpaper.vue +13 -1
- package/src/filiale/rongchuang/pc/checkPlanList.vue +398 -0
- package/src/filiale/rongchuang/pc.js +18 -17
- package/src/filiale/shanxian/pc/NewCheckpaper.vue +4 -4
- package/src/filiale/siyang/android/PhoneInsurancePurchaseDetail.vue +532 -498
- package/src/filiale/tongchuan/android/PhoneUpUserinfo.vue +888 -889
- package/src/filiale/tongchuan/android/SafecheckDevices.vue +909 -885
- package/src/filiale/tongchuan/pc/AMapTrailShowZk.vue +226 -0
- package/src/filiale/tongchuan/pc/CheckPlanCountChartAreaByWangGeYuan.vue +137 -0
- package/src/filiale/tongchuan/pc/CheckSearchUser.vue +47 -1
- package/src/filiale/tongchuan/pc/DefectPaperWeiXiu.vue +46 -0
- package/src/filiale/tongchuan/pc/NoCheckplanSafecheck.vue +34 -0
- package/src/filiale/tongchuan/pc/PaperDefectMain.vue +34 -0
- package/src/filiale/tongchuan/pc/PaperList.vue +44 -10
- package/src/filiale/tongchuan/pc/PersonTrack.vue +269 -0
- package/src/filiale/tongchuan/pc/SelectCheckPlan.vue +42 -2
- package/src/filiale/tongchuan/pc.js +3 -0
- package/src/filiale/wensu/android/SafecheckOrderV.vue +2444 -2444
- package/src/filiale/wensu/android/SafecheckUserInfo.vue +712 -712
- package/src/filiale/wensu/pc/CheckSearchUser.vue +1251 -1251
- package/src/filiale/wenxi/pc/PaperList.vue +9 -3
- package/src/filiale/wuan/android/SafecheckOrderV.vue +2242 -2242
- package/src/filiale/wuan/android/SafecheckUserInfo.vue +659 -659
- package/src/filiale/yangchunboneng/android/AndiroidSecurityAudit.vue +2 -1
- package/src/filiale/yangchunboneng/android/CurrentCreate.vue +1191 -1191
- package/src/filiale/yangchunboneng/android/SafecheckUserInfo.vue +913 -913
- package/src/filiale/yangchunboneng/android.js +21 -21
- package/src/filiale/yangchunboneng/pc/CheckBookList.vue +353 -353
- package/src/filiale/yangchunboneng/pc/CheckPlanAreaList.vue +3 -3
- package/src/filiale/yangchunboneng/pc/CheckSearchUser.vue +1197 -1197
- package/src/filiale/yangchunboneng/pc/HiddenSituation.vue +171 -171
- package/src/filiale/yangchunboneng/pc/PaperDefectMain.vue +1112 -1112
- package/src/filiale/yangchunboneng/pc/PaperList.vue +757 -757
- package/src/filiale/yangchunboneng/pc/SelectCheckPlan.vue +331 -331
- package/src/filiale/yangchunboneng/pc.js +29 -29
- package/src/main.js +33 -33
- package/src/rongcheng.js +319 -319
- package/src/safecheck-android.js +316 -315
- package/yarn-error.log +0 -140
|
@@ -0,0 +1,226 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="basic-main" style="height: 100%">
|
|
3
|
+
<div>
|
|
4
|
+
<div class="col-sm-9 amap-main" >
|
|
5
|
+
<div class="form-horizontal select-overspread container-fluid auto">
|
|
6
|
+
<div class="row">
|
|
7
|
+
<div class="col-sm-3 form-input-group" style="width: 20%">
|
|
8
|
+
<label class="control-label">公  司</label>
|
|
9
|
+
<right-tree-safe @re-res="getRes" >
|
|
10
|
+
</right-tree-safe>
|
|
11
|
+
</div>
|
|
12
|
+
<div class="col-sm-3 form-input-group" style="width: 20%">
|
|
13
|
+
<label class="control-label" >轨迹时间</label>
|
|
14
|
+
<datepicker placeholder="轨迹时间"
|
|
15
|
+
:value.sync="requestData.chengeDate"
|
|
16
|
+
v-model="requestData.chengeDate"
|
|
17
|
+
:format="'yyyy-MM-dd'">
|
|
18
|
+
</datepicker>
|
|
19
|
+
</div>
|
|
20
|
+
<div class="col-sm-3 form-input-group" style="width: 20%">
|
|
21
|
+
<label class="control-label">安检员</label>
|
|
22
|
+
<v-select :value.sync="selUserIds" v-model='selUserIds'
|
|
23
|
+
:value-single="false" clear-button search multiple
|
|
24
|
+
:options='searchUserEndOption' placeholder='安检员'
|
|
25
|
+
></v-select>
|
|
26
|
+
</div>
|
|
27
|
+
<div class="col-sm-3 form-input-group" style="width: 20%">
|
|
28
|
+
<label class="control-label">网格员</label>
|
|
29
|
+
<v-select class="select_list select"
|
|
30
|
+
placeholder='请选择' style="width: 60%"
|
|
31
|
+
:value.sync="requestData.f_book_checker" v-model="requestData.f_book_checker"
|
|
32
|
+
:options='users'
|
|
33
|
+
filer-key="name"
|
|
34
|
+
close-on-select clear-button
|
|
35
|
+
:value-single="true">
|
|
36
|
+
</v-select>
|
|
37
|
+
</div>
|
|
38
|
+
<div class="col-sm-3 form-input-group" style="width: 20%;float:right;">
|
|
39
|
+
<button class="btn btn-primary" @click="search">查询</button>
|
|
40
|
+
</div>
|
|
41
|
+
</div>
|
|
42
|
+
</div>
|
|
43
|
+
<amap-trajectory :outerlinedata.sync="outerlinedata" :pathnavigatorstyle="pathnavigatorstyle" ></amap-trajectory>
|
|
44
|
+
</div>
|
|
45
|
+
<div class="col-sm-3">
|
|
46
|
+
<div id="zzz" class="basic-main" style="flex:1;margin-left: 0px;overflow: hidden">
|
|
47
|
+
<div class="flex">
|
|
48
|
+
<div class="panel panel-info" style="flex: 4;margin-top:0px;height: 50%">
|
|
49
|
+
<div class="panel-heading" style="height: auto">
|
|
50
|
+
<h3 class="panel-title">轨迹记录</h3>
|
|
51
|
+
</div>
|
|
52
|
+
<div class="panel-body" style="overflow: scroll">
|
|
53
|
+
<accordion :one-at-a-time="true" v-if="reponData.length>0">
|
|
54
|
+
<template v-for="row in reponData">
|
|
55
|
+
<panel is-open="false" type="primary">
|
|
56
|
+
<strong slot="header">用户编号:{{row.f_user_id}} 用户姓名:{{row.f_user_name}}</strong>
|
|
57
|
+
<div v-for="(idx,item) in row.result" @click="chengeLocation(item)" :class="{'alert alert-info':idx%2===0,'alert alert-success':idx%2!==0}">
|
|
58
|
+
轨迹时间段:{{item.f_start_date}} ~ {{item.f_end_date}}
|
|
59
|
+
</div>
|
|
60
|
+
</panel>
|
|
61
|
+
</template>
|
|
62
|
+
</accordion>
|
|
63
|
+
<h4 class="panel-title" v-else>暂无相关数据</h4>
|
|
64
|
+
</div>
|
|
65
|
+
</div>
|
|
66
|
+
</div>
|
|
67
|
+
</div>
|
|
68
|
+
</div>
|
|
69
|
+
</div>
|
|
70
|
+
|
|
71
|
+
</div>
|
|
72
|
+
</template>
|
|
73
|
+
|
|
74
|
+
<script>
|
|
75
|
+
import co from 'co'
|
|
76
|
+
import * as Util from '../../Util'
|
|
77
|
+
import {HttpResetClass} from 'vue-client'
|
|
78
|
+
|
|
79
|
+
/**
|
|
80
|
+
* 1. 首先获取当前选择的分公司下所有带定位角色的所有用户
|
|
81
|
+
* 2. 根据查询出来的所有用户的id和选择的时间去轨迹表查询,获取具体轨迹的时间段
|
|
82
|
+
* 3. 渲染给前台页面,前台根据选择的用户和时间端获取轨迹信息去渲染轨迹,每次只可以渲染一组轨迹
|
|
83
|
+
*/
|
|
84
|
+
|
|
85
|
+
|
|
86
|
+
export default {
|
|
87
|
+
title: "安检员轨迹展示",
|
|
88
|
+
data() {
|
|
89
|
+
return {
|
|
90
|
+
toUserIds: '', //当前分公司下所有的用户id
|
|
91
|
+
selUserIds:[], // 当前选择的用户Id
|
|
92
|
+
requestData: {
|
|
93
|
+
chengeDate: Util.toStandardDateString(),
|
|
94
|
+
f_book_checker:'',
|
|
95
|
+
userIds: '',
|
|
96
|
+
},
|
|
97
|
+
searchUserEndOption: [], //当前公司的所有安检员
|
|
98
|
+
reponData: [], // 请求到的结果集合
|
|
99
|
+
outerlinedata: [], //点集
|
|
100
|
+
users:[{label: '全部', value: ''}],
|
|
101
|
+
pathnavigatorstyle: {
|
|
102
|
+
width: 16, //图标宽度
|
|
103
|
+
height: 32, // 图标高度
|
|
104
|
+
iconBase64: 'https://webapi.amap.com/ui/1.1/ui/misc/PathSimplifier/examples/imgs/car.png'//图标地址(外链地址或者Base64)
|
|
105
|
+
},
|
|
106
|
+
f_filialeids: '', //分公司ids
|
|
107
|
+
path: [],
|
|
108
|
+
}
|
|
109
|
+
},
|
|
110
|
+
methods: {
|
|
111
|
+
initBookChecker(){
|
|
112
|
+
new HttpResetClass().load('POST', '/rs/search', {
|
|
113
|
+
data: {
|
|
114
|
+
source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($网格员$) != -1)`,
|
|
115
|
+
userid: this.$login.f.id
|
|
116
|
+
}
|
|
117
|
+
}, {resolveMsg: null, rejectMsg: null}).then(res=>{
|
|
118
|
+
let data = res.data
|
|
119
|
+
const addedNames = new Set()
|
|
120
|
+
this.users = []
|
|
121
|
+
data.forEach(user => {
|
|
122
|
+
if (user.state === '在职') {
|
|
123
|
+
if (!addedNames.has(user.name)) {
|
|
124
|
+
this.users.push({label:user.name,value:user.id})
|
|
125
|
+
addedNames.add(user.name)
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
})
|
|
129
|
+
console.log(this.users)
|
|
130
|
+
})
|
|
131
|
+
},
|
|
132
|
+
search() {
|
|
133
|
+
if (this.selUserIds.length==0&&!this.requestData.userIds) {
|
|
134
|
+
this.requestData.userIds = this.toUserIds
|
|
135
|
+
}
|
|
136
|
+
if (this.requestData.f_book_checker){
|
|
137
|
+
const content = this.requestData.userIds.slice(1, -1)
|
|
138
|
+
const elements = content.split(',')
|
|
139
|
+
elements.push(`'${this.requestData.f_book_checker}'`)
|
|
140
|
+
this.requestData.userIds = `(${elements.join(',')})`
|
|
141
|
+
}
|
|
142
|
+
if (!this.f_filialeids) {
|
|
143
|
+
return this.$showMessage("请选择需要查询的分公司")
|
|
144
|
+
}
|
|
145
|
+
if (!this.requestData.chengeDate) {
|
|
146
|
+
return this.$showMessage("请选择需要查看的轨迹时间")
|
|
147
|
+
}
|
|
148
|
+
this.$resetpost('rs/logic/QueryUserTracksByCompany',this.requestData,{resolveMsg: "轨迹记录查询成功", rejectMsg: "轨迹记录查询失败"}).then((response)=>{
|
|
149
|
+
if (response!=undefined && response.data.code == 200) {
|
|
150
|
+
this.reponData = response.data.data
|
|
151
|
+
}else if (response!=null && response.data.code == 404) {
|
|
152
|
+
this.reponData = []
|
|
153
|
+
this.$showMessage("未查询到当前用户的相关轨迹信息")
|
|
154
|
+
} else if (response!=null && response.data.code == 555) {
|
|
155
|
+
this.$showMessage("查询轨迹信息错误!错误原因:"+response.data.msg)
|
|
156
|
+
}
|
|
157
|
+
})
|
|
158
|
+
},
|
|
159
|
+
getRes(obj){
|
|
160
|
+
// this.model.f_filialeids = this.$login.convertToIn(obj.resids);
|
|
161
|
+
console.log(obj)
|
|
162
|
+
if (obj.res != undefined && obj.res.length > 0 && obj.res[0] != undefined) {
|
|
163
|
+
this.getNewData(obj.res[0])
|
|
164
|
+
this.initBookChecker(obj.res[0])
|
|
165
|
+
}
|
|
166
|
+
this.f_filialeids = this.$login.convertToIn(obj.resids);
|
|
167
|
+
},
|
|
168
|
+
chengeLocation(row) {
|
|
169
|
+
console.log(row)
|
|
170
|
+
this.$resetpost('rs/logic/queryRemoteLocationMapData',{data:{id:row.id}},{resolveMsg: "查询渲染轨迹成功", rejectMsg:"查询渲染轨迹失败!"}).then((response)=>{
|
|
171
|
+
if (response!=undefined && response.data!=undefined) {
|
|
172
|
+
this.path = response.data
|
|
173
|
+
let name = `${row.f_user_name},${row.f_start_date}~${row.f_end_date}轨迹`
|
|
174
|
+
this.outerlinedata = [{path:this.path,speed:Math.ceil(this.path.length / 2),name:name}]
|
|
175
|
+
}
|
|
176
|
+
})
|
|
177
|
+
},
|
|
178
|
+
//获取定位人员类表
|
|
179
|
+
async getNewData(organization){
|
|
180
|
+
// let organization = '公司名称'
|
|
181
|
+
// let userRolestr = '需要定位人员'
|
|
182
|
+
let userRolestr = '安检员'
|
|
183
|
+
let res =await new HttpResetClass().load('POST', '/rs/search', {
|
|
184
|
+
// source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($需要定位人员$) != -1))',
|
|
185
|
+
source: "this.getParentByName($"+organization+"$).getAllChildrens().where(row.getAttributes().get($resourcetype$)==$user$).where(row.getAttributes().get($rolestr$)!=null).where(row.getAttributes().get($rolestr$).indexOf($"+userRolestr+"$)!=-1)",
|
|
186
|
+
userid: this.$login.f.id
|
|
187
|
+
}, {resolveMsg: null, rejectMsg: null})
|
|
188
|
+
let dataEnd = [];
|
|
189
|
+
let idsEnd = [];
|
|
190
|
+
res.data.forEach(res=>{
|
|
191
|
+
let h=true
|
|
192
|
+
dataEnd.forEach(per=>{
|
|
193
|
+
if(res.id==per.value){
|
|
194
|
+
h=false
|
|
195
|
+
}
|
|
196
|
+
})
|
|
197
|
+
if(h){
|
|
198
|
+
dataEnd.push({label:res.name,value:res.id})
|
|
199
|
+
idsEnd.push(res.id)
|
|
200
|
+
}
|
|
201
|
+
})
|
|
202
|
+
this.toUserIds = this.$login.convertToIn(idsEnd); //所有的员工ID
|
|
203
|
+
this.searchUserEndOption = dataEnd
|
|
204
|
+
},
|
|
205
|
+
},
|
|
206
|
+
ready(){
|
|
207
|
+
this.initBookChecker()
|
|
208
|
+
},
|
|
209
|
+
watch: {
|
|
210
|
+
'selUserIds':function (val) {
|
|
211
|
+
if (val=='') {
|
|
212
|
+
this.requestData.userIds = ''
|
|
213
|
+
}else {
|
|
214
|
+
this.requestData.userIds = this.$login.convertToIn(val)
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
</script>
|
|
220
|
+
|
|
221
|
+
<style lang="less" scoped>
|
|
222
|
+
.amap-main {
|
|
223
|
+
height: 90%;
|
|
224
|
+
padding-right:10px;
|
|
225
|
+
}
|
|
226
|
+
</style>
|
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div id='app' class="basic-main" style="height: 100%">
|
|
3
|
+
<criteria-paged :model="model" :pager='false' v-ref:paged>
|
|
4
|
+
<criteria partial='criteria' @condition-changed='$parent.search' class="search_area" v-ref:criteria>
|
|
5
|
+
<div novalidate class="form-inline auto" partial>
|
|
6
|
+
<div class="row">
|
|
7
|
+
<div class="col-sm-4 form-group">
|
|
8
|
+
<role-selector-safe
|
|
9
|
+
:value-multiple="true"
|
|
10
|
+
:value-close="false"
|
|
11
|
+
role-name="网格员"
|
|
12
|
+
role-lable="网 格 员"
|
|
13
|
+
@re-res="$parent.$parent.getRes"
|
|
14
|
+
:value.sync="model.f_checker_id"
|
|
15
|
+
v-model="model.f_checker_id"
|
|
16
|
+
condition="f_checker_name in {}">
|
|
17
|
+
</role-selector-safe>
|
|
18
|
+
</div>
|
|
19
|
+
<div class="col-sm-2 form-group">
|
|
20
|
+
<label for="startDate" class="font_normal_body">开始日期:</label>
|
|
21
|
+
<datepicker id="startDate" placeholder="开始日期"
|
|
22
|
+
v-model="model.startDate"
|
|
23
|
+
:value.sync="model.startDate"
|
|
24
|
+
style="width: 60%;"
|
|
25
|
+
:disabled-days-of-Week="[]"
|
|
26
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
27
|
+
:show-reset-button="reset">
|
|
28
|
+
</datepicker>
|
|
29
|
+
</div>
|
|
30
|
+
<div class="form-group col-sm-2">
|
|
31
|
+
<label class="font_normal_body">部门</label>
|
|
32
|
+
<v-select :value.sync="model.f_department_name" v-model='model.f_department_name'
|
|
33
|
+
:value-single="true" style="width: 60%"
|
|
34
|
+
class="select_list select"
|
|
35
|
+
:options='$parent.$parent.department_names' placeholder='部门'
|
|
36
|
+
close-on-select
|
|
37
|
+
condition="f_department_name = '{}'"></v-select>
|
|
38
|
+
</div>
|
|
39
|
+
<div class="col-sm-2 form-group">
|
|
40
|
+
<label for="endDate" class="font_normal_body">结束日期:</label>
|
|
41
|
+
<datepicker id="endDate" placeholder="结束日期"
|
|
42
|
+
v-model="model.endDate"
|
|
43
|
+
:value.sync="model.endDate"
|
|
44
|
+
:disabled-days-of-Week="[]"
|
|
45
|
+
style="width: 60%;"
|
|
46
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
47
|
+
:show-reset-button="reset">
|
|
48
|
+
</datepicker>
|
|
49
|
+
</div>
|
|
50
|
+
<div class="col-sm-3 form-group" style="margin-top: 8px">
|
|
51
|
+
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
52
|
+
<report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>
|
|
53
|
+
<report-excel class="button_export button_spacing" style="width:28%" id='shexian'></report-excel>
|
|
54
|
+
</div>
|
|
55
|
+
</div>
|
|
56
|
+
</div>
|
|
57
|
+
</criteria>
|
|
58
|
+
<div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
|
|
59
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
60
|
+
<thead>
|
|
61
|
+
<tr>
|
|
62
|
+
<th colspan='5' style="font-weight: normal; text-align: left;">
|
|
63
|
+
<h3 style="text-align: center">安检数据报表</h3>
|
|
64
|
+
</th>
|
|
65
|
+
</tr>
|
|
66
|
+
<tr>
|
|
67
|
+
<th colspan='5' style="font-weight: normal; text-align: center;">
|
|
68
|
+
开始时间:{{model.model.startDate}}
|
|
69
|
+
结束时间:{{ model.model.endDate }}
|
|
70
|
+
</th>
|
|
71
|
+
</tr>
|
|
72
|
+
</thead>
|
|
73
|
+
<tr>
|
|
74
|
+
<th colspan='5' style="font-weight: normal;">
|
|
75
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
76
|
+
</th>
|
|
77
|
+
</tr>
|
|
78
|
+
</table>
|
|
79
|
+
</div>
|
|
80
|
+
</criteria-paged>
|
|
81
|
+
</div>
|
|
82
|
+
|
|
83
|
+
</template>
|
|
84
|
+
|
|
85
|
+
<script>
|
|
86
|
+
import {DataModel, HttpResetClass} from 'vue-client'
|
|
87
|
+
import * as Util from "../../../components/Util";
|
|
88
|
+
|
|
89
|
+
export default {
|
|
90
|
+
title: '统计报表',
|
|
91
|
+
data() {
|
|
92
|
+
let model = new DataModel('/rs/safecheck/report/CheckPlanCountChartAreaByWangGeYuan', {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_filialeid: 'this.f_filialeid'})
|
|
93
|
+
model.f_filialeid = '(' + this.$login.f.orgid + ')'
|
|
94
|
+
return {
|
|
95
|
+
filialeNameStr: '',
|
|
96
|
+
filialeCodeStr: '',
|
|
97
|
+
department_names:[{label:'全部',value:''}],
|
|
98
|
+
userid: this.$login.f.id,
|
|
99
|
+
source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
|
|
100
|
+
model: model
|
|
101
|
+
}
|
|
102
|
+
},
|
|
103
|
+
methods: {
|
|
104
|
+
getRes(obj) {
|
|
105
|
+
this.model.f_filialeid = this.$login.convertToIn(obj.resids);
|
|
106
|
+
},
|
|
107
|
+
search(args){
|
|
108
|
+
if (args.model.endDate){
|
|
109
|
+
args.condition += ` and tcp.f_offsite_time <= '${args.model.endDate}'`
|
|
110
|
+
}
|
|
111
|
+
if (args.model.startDate){
|
|
112
|
+
args.condition += ` and tcp.f_offsite_time >= '${args.model.startDate}'`
|
|
113
|
+
}
|
|
114
|
+
if (this.model.f_filialeid){
|
|
115
|
+
args.condition += ` and o.id in ${this.model.f_filialeid}`
|
|
116
|
+
}
|
|
117
|
+
this.model.search(args.condition,args.model)
|
|
118
|
+
}
|
|
119
|
+
},
|
|
120
|
+
ready() {
|
|
121
|
+
this.$refs.paged.$refs.criteria.model.startDate = Util.toStandardDateString()+' 00:00:00'
|
|
122
|
+
this.$refs.paged.$refs.criteria.model.endDate = Util.toStandardDateString()+' 23:59:59'
|
|
123
|
+
new HttpResetClass().load('post','/rs/sql/searchGroupByArea',{data:{condition:"1=1"}}).then(response=>{
|
|
124
|
+
response.data.forEach(item=>{
|
|
125
|
+
this.department_names.push({label:item.f_residential_area,value:item.f_residential_area})
|
|
126
|
+
})
|
|
127
|
+
}).catch(error=>{
|
|
128
|
+
|
|
129
|
+
})
|
|
130
|
+
},
|
|
131
|
+
computed: {
|
|
132
|
+
selected() {
|
|
133
|
+
return this.$refs.grid.selected
|
|
134
|
+
},
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
</script>
|
|
@@ -217,6 +217,18 @@
|
|
|
217
217
|
:value-single="true"
|
|
218
218
|
close-on-select clear-button></v-select>
|
|
219
219
|
</div>
|
|
220
|
+
<div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
|
|
221
|
+
<label class="font_normal_body">网 格 员</label>
|
|
222
|
+
<v-select class="select_list select"
|
|
223
|
+
placeholder='请选择' style="width: 60%"
|
|
224
|
+
:value.sync="model.f_book_checker" v-model="model.f_book_checker"
|
|
225
|
+
:options='$parent.$parent.users'
|
|
226
|
+
filer-key="name"
|
|
227
|
+
close-on-select clear-button
|
|
228
|
+
condition="f_book_checker like '%{}%' and f_checker_name = '{}'"
|
|
229
|
+
:value-single="true">
|
|
230
|
+
</v-select>
|
|
231
|
+
</div>
|
|
220
232
|
</div>
|
|
221
233
|
|
|
222
234
|
<div class="row" v-show="$parent.$parent.$parent.showItem">
|
|
@@ -324,7 +336,18 @@
|
|
|
324
336
|
:value-single="true"
|
|
325
337
|
close-on-select clear-button></v-select>
|
|
326
338
|
</div>
|
|
327
|
-
|
|
339
|
+
<div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
|
|
340
|
+
<label class="font_normal_body">网 格 员</label>
|
|
341
|
+
<v-select class="select_list select"
|
|
342
|
+
placeholder='请选择' style="width: 60%"
|
|
343
|
+
:value.sync="model.f_book_checker" v-model="model.f_book_checker"
|
|
344
|
+
:options='$parent.$parent.users'
|
|
345
|
+
filer-key="name"
|
|
346
|
+
close-on-select clear-button
|
|
347
|
+
condition="f_book_checker like '%{}%' and f_checker_name = '{}'"
|
|
348
|
+
:value-single="true">
|
|
349
|
+
</v-select>
|
|
350
|
+
</div>
|
|
328
351
|
</div>
|
|
329
352
|
<div class="row" v-show="$parent.$parent.$parent.showItem">
|
|
330
353
|
<div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
|
|
@@ -536,6 +559,7 @@
|
|
|
536
559
|
timetype: "'dd'",
|
|
537
560
|
f_defect_content: 'this.f_defect_content'
|
|
538
561
|
}),
|
|
562
|
+
users:[{label: '全部', value: ''}],
|
|
539
563
|
f_defect_content: "CASE WHEN CHARINDEX( '\"result\":\"正常\"', ua.f_last_check_result ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( ua.f_last_check_result, len( ua.f_last_check_result ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END",
|
|
540
564
|
orgstrs: [{label: '全部', value: ''}],
|
|
541
565
|
checkersid: [],
|
|
@@ -609,8 +633,30 @@
|
|
|
609
633
|
this.Mreadibook(`('${this.$login.f.orgid}')`)
|
|
610
634
|
this.getAllMeterBook(`('${this.$login.f.orgid}')`)
|
|
611
635
|
this.getTableBrands()
|
|
636
|
+
this.initBookChecker()
|
|
637
|
+
|
|
612
638
|
},
|
|
613
639
|
methods: {
|
|
640
|
+
initBookChecker(){
|
|
641
|
+
new HttpResetClass().load('POST', '/rs/search', {
|
|
642
|
+
data: {
|
|
643
|
+
source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($网格员$) != -1)`,
|
|
644
|
+
userid: this.$login.f.id
|
|
645
|
+
}
|
|
646
|
+
}, {resolveMsg: null, rejectMsg: null}).then(res=>{
|
|
647
|
+
let data = res.data
|
|
648
|
+
const addedNames = new Set()
|
|
649
|
+
this.users = []
|
|
650
|
+
data.forEach(user => {
|
|
651
|
+
if (user.state === '在职') {
|
|
652
|
+
if (!addedNames.has(user.name)) {
|
|
653
|
+
this.users.push({ label: user.name, value: user.name })
|
|
654
|
+
addedNames.add(user.name)
|
|
655
|
+
}
|
|
656
|
+
}
|
|
657
|
+
});
|
|
658
|
+
})
|
|
659
|
+
},
|
|
614
660
|
getTableBrands() {
|
|
615
661
|
new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,
|
|
616
662
|
{data: {items: "*", tablename: "t_gasbrand", orderitem: "id", condition: ` 1=1 `}},
|
|
@@ -157,6 +157,18 @@
|
|
|
157
157
|
:value-single="true">
|
|
158
158
|
</v-select>
|
|
159
159
|
</div>
|
|
160
|
+
<div :class="$parent.$parent.style">
|
|
161
|
+
<label class="font_normal_body">网 格 员</label>
|
|
162
|
+
<v-select class="select_list select"
|
|
163
|
+
placeholder='请选择' style="width: 60%"
|
|
164
|
+
:value.sync="model.f_book_checker" v-model="model.f_book_checker"
|
|
165
|
+
:options='$parent.$parent.users'
|
|
166
|
+
filer-key="name"
|
|
167
|
+
close-on-select clear-button
|
|
168
|
+
condition="f_book_checker like '%{}%' and f_checker_name = '{}'"
|
|
169
|
+
:value-single="true">
|
|
170
|
+
</v-select>
|
|
171
|
+
</div>
|
|
160
172
|
|
|
161
173
|
|
|
162
174
|
</div>
|
|
@@ -334,6 +346,18 @@
|
|
|
334
346
|
:value-single="true">
|
|
335
347
|
</v-select>
|
|
336
348
|
</div>
|
|
349
|
+
<div :class="$parent.$parent.style">
|
|
350
|
+
<label class="font_normal_body">网 格 员</label>
|
|
351
|
+
<v-select class="select_list select"
|
|
352
|
+
placeholder='请选择' style="width: 60%"
|
|
353
|
+
:value.sync="model.f_book_checker" v-model="model.f_book_checker"
|
|
354
|
+
:options='$parent.$parent.users'
|
|
355
|
+
filer-key="name"
|
|
356
|
+
close-on-select clear-button
|
|
357
|
+
condition="f_book_checker like '%{}%' and f_checker_name = '{}'"
|
|
358
|
+
:value-single="true">
|
|
359
|
+
</v-select>
|
|
360
|
+
</div>
|
|
337
361
|
|
|
338
362
|
</div>
|
|
339
363
|
</div>
|
|
@@ -431,6 +455,7 @@
|
|
|
431
455
|
gasproperties:[{label:'全部',value:''},...this.$appdata.getParam("民用"),...this.$appdata.getParam("非民用")],
|
|
432
456
|
gasproperties2:[],
|
|
433
457
|
modelval: [],
|
|
458
|
+
users:[{label: '全部', value: ''}],
|
|
434
459
|
checkersid: [],
|
|
435
460
|
sliceArea: [],
|
|
436
461
|
pcds:[],
|
|
@@ -553,6 +578,26 @@
|
|
|
553
578
|
})
|
|
554
579
|
}
|
|
555
580
|
},
|
|
581
|
+
initBookChecker(){
|
|
582
|
+
new HttpResetClass().load('POST', '/rs/search', {
|
|
583
|
+
data: {
|
|
584
|
+
source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($网格员$) != -1)`,
|
|
585
|
+
userid: this.$login.f.id
|
|
586
|
+
}
|
|
587
|
+
}, {resolveMsg: null, rejectMsg: null}).then(res=>{
|
|
588
|
+
let data = res.data
|
|
589
|
+
const addedNames = new Set()
|
|
590
|
+
this.users = []
|
|
591
|
+
data.forEach(user => {
|
|
592
|
+
if (user.state === '在职') {
|
|
593
|
+
if (!addedNames.has(user.name)) {
|
|
594
|
+
this.users.push({ label: user.name, value: user.name })
|
|
595
|
+
addedNames.add(user.name)
|
|
596
|
+
}
|
|
597
|
+
}
|
|
598
|
+
});
|
|
599
|
+
})
|
|
600
|
+
},
|
|
556
601
|
hiddenr() {
|
|
557
602
|
this.$parent.showItem = !this.$parent.showItem
|
|
558
603
|
},
|
|
@@ -587,6 +632,7 @@
|
|
|
587
632
|
},
|
|
588
633
|
ready() {
|
|
589
634
|
this.$refs.paged.$refs.criteria.model.f_has_defect = '有隐患'
|
|
635
|
+
this.initBookChecker()
|
|
590
636
|
let gen = select(this)
|
|
591
637
|
// this.Mreadibook(`('${this.$login.f.orgid}')`)
|
|
592
638
|
co(gen)
|
|
@@ -44,6 +44,18 @@
|
|
|
44
44
|
condition="f_upload_date <='{} '">
|
|
45
45
|
</datepicker>
|
|
46
46
|
</div>
|
|
47
|
+
<div class="col-sm-3 form-group form-input-group" style="width: 20%;">
|
|
48
|
+
<label class="font_normal_body">网 格 员</label>
|
|
49
|
+
<v-select class="select_list select"
|
|
50
|
+
placeholder='请选择' style="width: 60%"
|
|
51
|
+
:value.sync="model.f_book_checker" v-model="model.f_book_checker"
|
|
52
|
+
:options='$parent.$parent.users'
|
|
53
|
+
filer-key="name"
|
|
54
|
+
close-on-select clear-button
|
|
55
|
+
condition="f_book_checker like '%{}%' and f_checker_name = '{}'"
|
|
56
|
+
:value-single="true">
|
|
57
|
+
</v-select>
|
|
58
|
+
</div>
|
|
47
59
|
<div class="col-sm-3 form-group form-input-group" style="width: 20%;float: right;">
|
|
48
60
|
<report-print class="button_export button_spacing" style="width:28%" id='tongchuan'></report-print>
|
|
49
61
|
<export-excel-safe :data="$parent.$parent.searchData"
|
|
@@ -145,6 +157,7 @@ export default {
|
|
|
145
157
|
source: 'tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))', //获取公司参数
|
|
146
158
|
userid: this.$login.f.id,
|
|
147
159
|
orgname: '',
|
|
160
|
+
users:[{label: '全部', value: ''}],
|
|
148
161
|
// checker:{},
|
|
149
162
|
searchData: {
|
|
150
163
|
condition: '',
|
|
@@ -182,6 +195,26 @@ export default {
|
|
|
182
195
|
this.searchData.f_filiale_id = this.f_filiale_id //导出
|
|
183
196
|
this.searchData.condition=args.condition //导出
|
|
184
197
|
this.model.search(args.condition, args.model)
|
|
198
|
+
},
|
|
199
|
+
initBookChecker(){
|
|
200
|
+
new HttpResetClass().load('POST', '/rs/search', {
|
|
201
|
+
data: {
|
|
202
|
+
source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($网格员$) != -1)`,
|
|
203
|
+
userid: this.$login.f.id
|
|
204
|
+
}
|
|
205
|
+
}, {resolveMsg: null, rejectMsg: null}).then(res=>{
|
|
206
|
+
let data = res.data
|
|
207
|
+
const addedNames = new Set()
|
|
208
|
+
this.users = []
|
|
209
|
+
data.forEach(user => {
|
|
210
|
+
if (user.state === '在职') {
|
|
211
|
+
if (!addedNames.has(user.name)) {
|
|
212
|
+
this.users.push({ label: user.name, value: user.name })
|
|
213
|
+
addedNames.add(user.name)
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
});
|
|
217
|
+
})
|
|
185
218
|
}
|
|
186
219
|
},
|
|
187
220
|
computed: {
|
|
@@ -197,6 +230,7 @@ export default {
|
|
|
197
230
|
//tag
|
|
198
231
|
this.$refs.paged.$refs.cri.model.startDate=Util.toStartDateString() +' 00:00:00'
|
|
199
232
|
this.$refs.paged.$refs.cri.model.endDate=Util.toEndDateString() +' 23:59:59'
|
|
233
|
+
this.initBookChecker()
|
|
200
234
|
|
|
201
235
|
}
|
|
202
236
|
|
|
@@ -190,6 +190,18 @@
|
|
|
190
190
|
clear-button condition="is_repaired='{}'" :value-single="true">
|
|
191
191
|
</v-select>
|
|
192
192
|
</div>
|
|
193
|
+
<div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
|
|
194
|
+
<label class="font_normal_body">网 格 员</label>
|
|
195
|
+
<v-select class="select_list select"
|
|
196
|
+
placeholder='请选择' style="width: 60%"
|
|
197
|
+
:value.sync="model.f_book_checker" v-model="model.f_book_checker"
|
|
198
|
+
:options='$parent.$parent.users'
|
|
199
|
+
filer-key="name"
|
|
200
|
+
close-on-select clear-button
|
|
201
|
+
condition="f_book_checker like '%{}%' and f_checker_name = '{}'"
|
|
202
|
+
:value-single="true">
|
|
203
|
+
</v-select>
|
|
204
|
+
</div>
|
|
193
205
|
</div>
|
|
194
206
|
<modal :show.sync="$parent.$parent.showModal" v-ref:modal>
|
|
195
207
|
<div slot="modal-header" class="modal-header">
|
|
@@ -523,6 +535,7 @@
|
|
|
523
535
|
},
|
|
524
536
|
fun: this.$login.f,
|
|
525
537
|
checkersid: [],
|
|
538
|
+
users:[{label: '全部', value: ''}],
|
|
526
539
|
safetype: this.getSafeParam('安检类型'),
|
|
527
540
|
criteriaShow: false,
|
|
528
541
|
repaireds: [{ label: '全部', value: '' }, { label: '已修', value: '已修' }, { label: '未修', value: '未修' }],
|
|
@@ -1006,6 +1019,26 @@
|
|
|
1006
1019
|
})
|
|
1007
1020
|
})
|
|
1008
1021
|
},
|
|
1022
|
+
initBookChecker(){
|
|
1023
|
+
new HttpResetClass().load('POST', '/rs/search', {
|
|
1024
|
+
data: {
|
|
1025
|
+
source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($网格员$) != -1)`,
|
|
1026
|
+
userid: this.$login.f.id
|
|
1027
|
+
}
|
|
1028
|
+
}, {resolveMsg: null, rejectMsg: null}).then(res=>{
|
|
1029
|
+
let data = res.data
|
|
1030
|
+
const addedNames = new Set()
|
|
1031
|
+
this.users = []
|
|
1032
|
+
data.forEach(user => {
|
|
1033
|
+
if (user.state === '在职') {
|
|
1034
|
+
if (!addedNames.has(user.name)) {
|
|
1035
|
+
this.users.push({ label: user.name, value: user.name })
|
|
1036
|
+
addedNames.add(user.name)
|
|
1037
|
+
}
|
|
1038
|
+
}
|
|
1039
|
+
});
|
|
1040
|
+
})
|
|
1041
|
+
}
|
|
1009
1042
|
},
|
|
1010
1043
|
|
|
1011
1044
|
ready() {
|
|
@@ -1013,6 +1046,7 @@
|
|
|
1013
1046
|
this.readConfig()
|
|
1014
1047
|
this.function = this.f
|
|
1015
1048
|
this.getPcds(`('${this.$login.f.orgid}')`)
|
|
1049
|
+
this.initBookChecker()
|
|
1016
1050
|
let gen = select(this)
|
|
1017
1051
|
// this.Mreadibook(`('${this.$login.f.orgid}')`)
|
|
1018
1052
|
co(gen)
|